summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/binutils/2.18a/130-avr32-atmel-v1.0.1.patch52747
-rw-r--r--patches/binutils/2.25.1/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch536
-rw-r--r--patches/binutils/2.25/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch536
-rw-r--r--patches/gcc/3.4.6/100-uclibc-conf.patch492
-rw-r--r--patches/gcc/3.4.6/110-uclibc-locale.patch3255
-rw-r--r--patches/gcc/3.4.6/120-libstdc++-pic.patch46
-rw-r--r--patches/gcc/3.4.6/130-index_macro.patch26
-rw-r--r--patches/gcc/3.4.6/140-arm-ldm-peephole.patch68
-rw-r--r--patches/gcc/3.4.6/150-arm-ldm.patch120
-rw-r--r--patches/gcc/3.4.6/160-arm-ldm-peephole2.patch32
-rw-r--r--patches/gcc/3.4.6/170-sdk-libstdc++-includes.patch24
-rw-r--r--patches/gcc/3.4.6/180-pr15068-fix.patch27
-rw-r--r--patches/gcc/3.4.6/190-all_sh-pr16665-fix.patch44
-rw-r--r--patches/gcc/3.4.6/200-all_sh-no-reorder-blocks.patch14
-rw-r--r--patches/gcc/3.4.6/210-all_sh-pr20617.patch24
-rw-r--r--patches/gcc/3.4.6/220-arm-bigendian.patch65
-rw-r--r--patches/gcc/3.4.6/230-powerpc-libc_stack_end-uclibc.patch16
-rw-r--r--patches/gcc/3.4.6/240-mips-xgot.patch7
-rw-r--r--patches/gcc/3.4.6/250-nios2.patch10231
-rw-r--r--patches/gcc/3.4.6/260-arm-softfloat.patch161
-rw-r--r--patches/gcc/4.0.4/100-uclibc-conf.patch553
-rw-r--r--patches/gcc/4.0.4/110-uclibc-locale.patch3237
-rw-r--r--patches/gcc/4.0.4/120-libstdc++-pic.patch45
-rw-r--r--patches/gcc/4.0.4/130-missing-execinfo_h.patch11
-rw-r--r--patches/gcc/4.0.4/140-c99-snprintf.patch11
-rw-r--r--patches/gcc/4.0.4/150-c99-complex-ugly-hack.patch12
-rw-r--r--patches/gcc/4.0.4/160-index_macro.patch24
-rw-r--r--patches/gcc/4.0.4/170-libmudflap-susv3-legacy.patch49
-rw-r--r--patches/gcc/4.0.4/180-sdk-libstdc++-includes.patch22
-rw-r--r--patches/gcc/4.0.4/190-arm-bigendian.patch65
-rw-r--r--patches/gcc/4.0.4/200-arm-softfloat.patch15
-rw-r--r--patches/gcc/4.1.2/100-uclibc-conf.patch544
-rw-r--r--patches/gcc/4.1.2/110-arm-eabi.patch25
-rw-r--r--patches/gcc/4.1.2/120-uclibc-locale.patch3239
-rw-r--r--patches/gcc/4.1.2/130-libstdc++-pic.patch48
-rw-r--r--patches/gcc/4.1.2/140-missing-execinfo_h.patch11
-rw-r--r--patches/gcc/4.1.2/150-c99-snprintf.patch11
-rw-r--r--patches/gcc/4.1.2/160-c99-complex-ugly-hack.patch12
-rw-r--r--patches/gcc/4.1.2/170-index_macro.patch24
-rw-r--r--patches/gcc/4.1.2/180-libbackend_dep_gcov-iov.h.patch11
-rw-r--r--patches/gcc/4.1.2/190-sh-pr24836.patch22
-rw-r--r--patches/gcc/4.1.2/200-arm-bigendian.patch114
-rw-r--r--patches/gcc/4.1.2/210-softfloat-fix.patch58
-rw-r--r--patches/gcc/4.2.0/100-uclibc-conf.patch200
-rw-r--r--patches/gcc/4.2.0/110-uclibc-conf-noupstream.patch11
-rw-r--r--patches/gcc/4.2.0/120-uclibc-locale.patch2790
-rw-r--r--patches/gcc/4.2.0/130-uclibc-locale-no__x.patch213
-rw-r--r--patches/gcc/4.2.0/140-uclibc-locale-wchar_fix.patch48
-rw-r--r--patches/gcc/4.2.0/150-uclibc-locale-update.patch347
-rw-r--r--patches/gcc/4.2.0/160-libstdc++-pic.patch50
-rw-r--r--patches/gcc/4.2.0/170-missing-execinfo_h.patch11
-rw-r--r--patches/gcc/4.2.0/180-c99-snprintf.patch11
-rw-r--r--patches/gcc/4.2.0/190-c99-complex-ugly-hack.patch12
-rw-r--r--patches/gcc/4.2.0/200-index_macro.patch24
-rw-r--r--patches/gcc/4.2.0/210-libmudflap-susv3-legacy.patch49
-rw-r--r--patches/gcc/4.2.0/220-libstdc++-namespace.patch36
-rw-r--r--patches/gcc/4.2.0/230-libbackend_dep_gcov-iov.h.patch13
-rw-r--r--patches/gcc/4.2.0/240-arm-bigendian.patch67
-rw-r--r--patches/gcc/4.2.0/250-softfloat-fix.patch58
-rw-r--r--patches/gcc/4.2.0/260-flatten-switch-stmt-00.patch153
-rw-r--r--patches/gcc/4.2.0/270-soft-float.patch21
-rw-r--r--patches/gcc/4.2.0/280-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.2.0/290-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.2.0/300-libgcc_eh.a.patch32
-rw-r--r--patches/gcc/4.2.1/100-uclibc-conf.patch216
-rw-r--r--patches/gcc/4.2.1/110-uclibc-conf-noupstream.patch12
-rw-r--r--patches/gcc/4.2.1/120-uclibc-locale.patch2806
-rw-r--r--patches/gcc/4.2.1/130-uclibc-locale-no__x.patch223
-rw-r--r--patches/gcc/4.2.1/140-uclibc-locale-wchar_fix.patch50
-rw-r--r--patches/gcc/4.2.1/150-uclibc-locale-update.patch354
-rw-r--r--patches/gcc/4.2.1/160-libstdc++-pic.patch50
-rw-r--r--patches/gcc/4.2.1/170-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.2.1/180-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.2.1/190-c99-complex-ugly-hack.patch13
-rw-r--r--patches/gcc/4.2.1/200-index_macro.patch26
-rw-r--r--patches/gcc/4.2.1/210-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.2.1/220-libstdc++-namespace.patch36
-rw-r--r--patches/gcc/4.2.1/230-libbackend_dep_gcov-iov.h.patch12
-rw-r--r--patches/gcc/4.2.1/240-arm-bigendian.patch64
-rw-r--r--patches/gcc/4.2.1/250-softfloat-fix.patch58
-rw-r--r--patches/gcc/4.2.1/260-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.2.1/270-soft-float.patch21
-rw-r--r--patches/gcc/4.2.1/280-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.2.1/290-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.2.1/300-libstdc++-nostdlib-linking.patch21
-rw-r--r--patches/gcc/4.2.1/310-libgcc_eh.a.patch32
-rw-r--r--patches/gcc/4.2.2/100-uclibc-conf.patch216
-rw-r--r--patches/gcc/4.2.2/110-uclibc-conf-noupstream.patch12
-rw-r--r--patches/gcc/4.2.2/120-uclibc-locale.patch2806
-rw-r--r--patches/gcc/4.2.2/130-uclibc-locale-no__x.patch223
-rw-r--r--patches/gcc/4.2.2/140-uclibc-locale-wchar_fix.patch50
-rw-r--r--patches/gcc/4.2.2/150-uclibc-locale-update.patch354
-rw-r--r--patches/gcc/4.2.2/160-libstdc++-pic.patch50
-rw-r--r--patches/gcc/4.2.2/170-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.2.2/180-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.2.2/190-c99-complex-ugly-hack.patch13
-rw-r--r--patches/gcc/4.2.2/200-index_macro.patch26
-rw-r--r--patches/gcc/4.2.2/210-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.2.2/220-libstdc++-namespace.patch36
-rw-r--r--patches/gcc/4.2.2/230-libbackend_dep_gcov-iov.h.patch12
-rw-r--r--patches/gcc/4.2.2/240-arm-bigendian.patch64
-rw-r--r--patches/gcc/4.2.2/250-softfloat-fix.patch58
-rw-r--r--patches/gcc/4.2.2/260-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.2.2/270-soft-float.patch21
-rw-r--r--patches/gcc/4.2.2/280-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.2.2/290-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.2.2/300-avr32-atmel-v1.1.3.patch22620
-rw-r--r--patches/gcc/4.2.2/310-libgcc_eh.a.patch32
-rw-r--r--patches/gcc/4.2.3/100-uclibc-conf.patch216
-rw-r--r--patches/gcc/4.2.3/110-uclibc-conf-noupstream.patch12
-rw-r--r--patches/gcc/4.2.3/120-uclibc-locale.patch2806
-rw-r--r--patches/gcc/4.2.3/130-uclibc-locale-no__x.patch223
-rw-r--r--patches/gcc/4.2.3/140-uclibc-locale-wchar_fix.patch50
-rw-r--r--patches/gcc/4.2.3/150-uclibc-locale-update.patch354
-rw-r--r--patches/gcc/4.2.3/160-libstdc++-pic.patch50
-rw-r--r--patches/gcc/4.2.3/170-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.2.3/180-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.2.3/190-c99-complex-ugly-hack.patch13
-rw-r--r--patches/gcc/4.2.3/200-index_macro.patch26
-rw-r--r--patches/gcc/4.2.3/210-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.2.3/220-libstdc++-namespace.patch36
-rw-r--r--patches/gcc/4.2.3/230-libbackend_dep_gcov-iov.h.patch12
-rw-r--r--patches/gcc/4.2.3/240-arm-bigendian.patch64
-rw-r--r--patches/gcc/4.2.3/250-softfloat-fix.patch58
-rw-r--r--patches/gcc/4.2.3/260-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.2.3/270-soft-float.patch21
-rw-r--r--patches/gcc/4.2.3/280-eabi_fixes.patch13
-rw-r--r--patches/gcc/4.2.3/290-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.2.3/300-fortran-signed-TImode.patch43
-rw-r--r--patches/gcc/4.2.3/310-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.2.3/320-libgcc_eh.a.patch32
-rw-r--r--patches/gcc/4.3.1/100-alpha-mieee-default.patch34
-rw-r--r--patches/gcc/4.3.1/110-trampolinewarn.patch35
-rw-r--r--patches/gcc/4.3.1/120-java-nomulti.patch47
-rw-r--r--patches/gcc/4.3.1/130-cross-compile.patch44
-rw-r--r--patches/gcc/4.3.1/140-netbsd-symbolic.patch14
-rw-r--r--patches/gcc/4.3.1/150-sparc64-bsd.patch30
-rw-r--r--patches/gcc/4.3.1/160-flatten-switch-stmt-00.patch76
-rw-r--r--patches/gcc/4.3.1/170-libiberty-pic.patch12
-rw-r--r--patches/gcc/4.3.1/180-superh-default-multilib.patch25
-rw-r--r--patches/gcc/4.3.1/190-libstdc++-pic.patch56
-rw-r--r--patches/gcc/4.3.1/200-pr24170.patch61
-rw-r--r--patches/gcc/4.3.1/210-noteGNUstack-00.patch96
-rw-r--r--patches/gcc/4.3.1/220-noteGNUstack-01.patch198
-rw-r--r--patches/gcc/4.3.1/230-pr34571.patch35
-rw-r--r--patches/gcc/4.3.1/240-pr25343.patch21
-rw-r--r--patches/gcc/4.3.1/250-sh-pr24836.patch28
-rw-r--r--patches/gcc/4.3.1/260-uclibc-conf-noupstream.patch13
-rw-r--r--patches/gcc/4.3.1/270-missing-execinfo_h.patch13
-rw-r--r--patches/gcc/4.3.1/280-c99-complex-ugly-hack.patch14
-rw-r--r--patches/gcc/4.3.1/290-index_macro.patch27
-rw-r--r--patches/gcc/4.3.1/300-libmudflap-susv3-legacy.patch49
-rw-r--r--patches/gcc/4.3.1/310-arm-softfloat.patch29
-rw-r--r--patches/gcc/4.3.1/320-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.3.1/330-unwind-for-uClibc.patch25
-rw-r--r--patches/gcc/4.3.1/340-make-mno-spe-work-as-expected.patch90
-rw-r--r--patches/gcc/4.3.1/350-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.3.1/360-unbreak-armv4t.patch11
-rw-r--r--patches/gcc/4.3.1/370-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.3.2/100-alpha-mieee-default.patch34
-rw-r--r--patches/gcc/4.3.2/110-trampolinewarn.patch35
-rw-r--r--patches/gcc/4.3.2/120-java-nomulti.patch47
-rw-r--r--patches/gcc/4.3.2/130-cross-compile.patch44
-rw-r--r--patches/gcc/4.3.2/140-netbsd-symbolic.patch14
-rw-r--r--patches/gcc/4.3.2/150-sparc64-bsd.patch30
-rw-r--r--patches/gcc/4.3.2/160-flatten-switch-stmt-00.patch76
-rw-r--r--patches/gcc/4.3.2/170-libiberty-pic.patch12
-rw-r--r--patches/gcc/4.3.2/180-superh-default-multilib.patch25
-rw-r--r--patches/gcc/4.3.2/190-libstdc++-pic.patch56
-rw-r--r--patches/gcc/4.3.2/200-pr24170.patch61
-rw-r--r--patches/gcc/4.3.2/210-noteGNUstack-00.patch96
-rw-r--r--patches/gcc/4.3.2/220-noteGNUstack-01.patch198
-rw-r--r--patches/gcc/4.3.2/230-pr34571.patch35
-rw-r--r--patches/gcc/4.3.2/240-pr25343.patch21
-rw-r--r--patches/gcc/4.3.2/250-sh-pr24836.patch28
-rw-r--r--patches/gcc/4.3.2/260-uclibc-conf-noupstream.patch13
-rw-r--r--patches/gcc/4.3.2/270-missing-execinfo_h.patch13
-rw-r--r--patches/gcc/4.3.2/280-c99-complex-ugly-hack.patch14
-rw-r--r--patches/gcc/4.3.2/290-index_macro.patch27
-rw-r--r--patches/gcc/4.3.2/300-libmudflap-susv3-legacy.patch49
-rw-r--r--patches/gcc/4.3.2/310-arm-softfloat.patch29
-rw-r--r--patches/gcc/4.3.2/320-alpha-signal_h.patch17
-rw-r--r--patches/gcc/4.3.2/330-unwind-for-uClibc.patch25
-rw-r--r--patches/gcc/4.3.2/340-make-mno-spe-work-as-expected.patch85
-rw-r--r--patches/gcc/4.3.2/350-sh-without-headers.patch26
-rw-r--r--patches/gcc/4.3.2/360-fix-expensive-optimize.patch207
-rw-r--r--patches/gcc/4.3.2/370-sh-no-libc.patch12
-rw-r--r--patches/gcc/4.3.2/380-pr37436.patch86
-rw-r--r--patches/gcc/4.3.2/390-unbreak-armv4t.patch11
-rw-r--r--patches/gcc/4.3.2/400-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.3.3/100-alpha-mieee-default.patch39
-rw-r--r--patches/gcc/4.3.3/110-trampolinewarn.patch40
-rw-r--r--patches/gcc/4.3.3/120-java-nomulti.patch52
-rw-r--r--patches/gcc/4.3.3/130-cross-compile.patch49
-rw-r--r--patches/gcc/4.3.3/140-netbsd-symbolic.patch19
-rw-r--r--patches/gcc/4.3.3/150-sparc64-bsd.patch35
-rw-r--r--patches/gcc/4.3.3/160-flatten-switch-stmt-00.patch81
-rw-r--r--patches/gcc/4.3.3/170-libiberty-pic.patch17
-rw-r--r--patches/gcc/4.3.3/180-superh-default-multilib.patch30
-rw-r--r--patches/gcc/4.3.3/190-libstdc++-pic.patch61
-rw-r--r--patches/gcc/4.3.3/200-pr24170.patch66
-rw-r--r--patches/gcc/4.3.3/210-noteGNUstack-00.patch101
-rw-r--r--patches/gcc/4.3.3/220-noteGNUstack-01.patch203
-rw-r--r--patches/gcc/4.3.3/230-pr34571.patch28
-rw-r--r--patches/gcc/4.3.3/240-pr25343.patch26
-rw-r--r--patches/gcc/4.3.3/250-sh-pr24836.patch33
-rw-r--r--patches/gcc/4.3.3/260-uclibc-conf-noupstream.patch18
-rw-r--r--patches/gcc/4.3.3/270-missing-execinfo_h.patch18
-rw-r--r--patches/gcc/4.3.3/280-c99-complex-ugly-hack.patch19
-rw-r--r--patches/gcc/4.3.3/290-index_macro.patch32
-rw-r--r--patches/gcc/4.3.3/300-libmudflap-susv3-legacy.patch54
-rw-r--r--patches/gcc/4.3.3/310-arm-softfloat.patch34
-rw-r--r--patches/gcc/4.3.3/320-alpha-signal_h.patch23
-rw-r--r--patches/gcc/4.3.3/330-unwind-for-uClibc.patch30
-rw-r--r--patches/gcc/4.3.3/340-make-mno-spe-work-as-expected.patch90
-rw-r--r--patches/gcc/4.3.3/350-sh-without-headers.patch29
-rw-r--r--patches/gcc/4.3.3/380-pr37436.patch86
-rw-r--r--patches/gcc/4.3.3/390-unbreak-armv4t.patch11
-rw-r--r--patches/gcc/4.3.3/400-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.3.4/100-alpha-mieee-default.patch39
-rw-r--r--patches/gcc/4.3.4/110-trampolinewarn.patch40
-rw-r--r--patches/gcc/4.3.4/120-java-nomulti.patch52
-rw-r--r--patches/gcc/4.3.4/130-cross-compile.patch49
-rw-r--r--patches/gcc/4.3.4/140-netbsd-symbolic.patch19
-rw-r--r--patches/gcc/4.3.4/150-sparc64-bsd.patch35
-rw-r--r--patches/gcc/4.3.4/160-flatten-switch-stmt-00.patch81
-rw-r--r--patches/gcc/4.3.4/170-libiberty-pic.patch17
-rw-r--r--patches/gcc/4.3.4/180-superh-default-multilib.patch30
-rw-r--r--patches/gcc/4.3.4/190-libstdc++-pic.patch61
-rw-r--r--patches/gcc/4.3.4/200-pr24170.patch66
-rw-r--r--patches/gcc/4.3.4/210-noteGNUstack-00.patch101
-rw-r--r--patches/gcc/4.3.4/220-noteGNUstack-01.patch203
-rw-r--r--patches/gcc/4.3.4/230-pr34571.patch28
-rw-r--r--patches/gcc/4.3.4/240-pr25343.patch26
-rw-r--r--patches/gcc/4.3.4/250-sh-pr24836.patch33
-rw-r--r--patches/gcc/4.3.4/260-uclibc-conf-noupstream.patch18
-rw-r--r--patches/gcc/4.3.4/270-missing-execinfo_h.patch18
-rw-r--r--patches/gcc/4.3.4/280-c99-complex-ugly-hack.patch19
-rw-r--r--patches/gcc/4.3.4/290-index_macro.patch32
-rw-r--r--patches/gcc/4.3.4/300-libmudflap-susv3-legacy.patch54
-rw-r--r--patches/gcc/4.3.4/310-arm-softfloat.patch34
-rw-r--r--patches/gcc/4.3.4/320-alpha-signal_h.patch23
-rw-r--r--patches/gcc/4.3.4/330-unwind-for-uClibc.patch30
-rw-r--r--patches/gcc/4.3.4/340-make-mno-spe-work-as-expected.patch90
-rw-r--r--patches/gcc/4.3.4/350-sh-without-headers.patch29
-rw-r--r--patches/gcc/4.3.4/380-pr37436.patch86
-rw-r--r--patches/gcc/4.3.4/390-unbreak-armv4t.patch11
-rw-r--r--patches/gcc/4.3.4/400-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.3.4/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.3.5/100-alpha-mieee-default.patch39
-rw-r--r--patches/gcc/4.3.5/110-trampolinewarn.patch40
-rw-r--r--patches/gcc/4.3.5/120-java-nomulti.patch52
-rw-r--r--patches/gcc/4.3.5/130-cross-compile.patch49
-rw-r--r--patches/gcc/4.3.5/140-netbsd-symbolic.patch19
-rw-r--r--patches/gcc/4.3.5/150-sparc64-bsd.patch35
-rw-r--r--patches/gcc/4.3.5/160-flatten-switch-stmt-00.patch81
-rw-r--r--patches/gcc/4.3.5/170-libiberty-pic.patch17
-rw-r--r--patches/gcc/4.3.5/180-superh-default-multilib.patch30
-rw-r--r--patches/gcc/4.3.5/190-libstdc++-pic.patch61
-rw-r--r--patches/gcc/4.3.5/200-pr24170.patch66
-rw-r--r--patches/gcc/4.3.5/210-noteGNUstack-00.patch101
-rw-r--r--patches/gcc/4.3.5/220-noteGNUstack-01.patch203
-rw-r--r--patches/gcc/4.3.5/230-pr34571.patch28
-rw-r--r--patches/gcc/4.3.5/240-pr25343.patch26
-rw-r--r--patches/gcc/4.3.5/250-sh-pr24836.patch33
-rw-r--r--patches/gcc/4.3.5/260-uclibc-conf-noupstream.patch18
-rw-r--r--patches/gcc/4.3.5/270-missing-execinfo_h.patch18
-rw-r--r--patches/gcc/4.3.5/280-c99-complex-ugly-hack.patch19
-rw-r--r--patches/gcc/4.3.5/290-index_macro.patch32
-rw-r--r--patches/gcc/4.3.5/300-libmudflap-susv3-legacy.patch54
-rw-r--r--patches/gcc/4.3.5/310-arm-softfloat.patch34
-rw-r--r--patches/gcc/4.3.5/320-alpha-signal_h.patch23
-rw-r--r--patches/gcc/4.3.5/330-unwind-for-uClibc.patch30
-rw-r--r--patches/gcc/4.3.5/340-make-mno-spe-work-as-expected.patch90
-rw-r--r--patches/gcc/4.3.5/350-sh-without-headers.patch29
-rw-r--r--patches/gcc/4.3.5/380-pr37436.patch86
-rw-r--r--patches/gcc/4.3.5/390-unbreak-armv4t.patch11
-rw-r--r--patches/gcc/4.3.5/400-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.3.5/410-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.3.5/420-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.0/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.0/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.0/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.0/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.0/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.0/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.0/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.0/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.0/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.0/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.0/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.0/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.0/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.0/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.0/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.0/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.0/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.0/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.0/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.0/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.0/300-pr40105.patch180
-rw-r--r--patches/gcc/4.4.0/310-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.0/320-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.0/330-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.0/340-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.0/350-index_macro.patch32
-rw-r--r--patches/gcc/4.4.0/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch40
-rw-r--r--patches/gcc/4.4.0/380-powerpc-libgcc_s-link-libm.patch135
-rw-r--r--patches/gcc/4.4.0/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.0/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.0/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.1/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.1/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.1/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.1/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.1/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.1/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.1/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.1/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.1/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.1/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.1/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.1/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.1/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.1/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.1/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.1/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.1/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.1/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.1/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.1/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.1/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.1/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.1/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.1/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.1/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.1/350-index_macro.patch32
-rw-r--r--patches/gcc/4.4.1/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch40
-rw-r--r--patches/gcc/4.4.1/380-powerpc-libgcc_s-link-libm.patch135
-rw-r--r--patches/gcc/4.4.1/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.1/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.1/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.2/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.2/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.2/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.2/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.2/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.2/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.2/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.2/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.2/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.2/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.2/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.2/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.2/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.2/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.2/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.2/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.2/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.2/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.2/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.2/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.2/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.2/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.2/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.2/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.2/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.2/350-index_macro.patch32
-rw-r--r--patches/gcc/4.4.2/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch40
-rw-r--r--patches/gcc/4.4.2/380-powerpc-libgcc_s-link-libm.patch135
-rw-r--r--patches/gcc/4.4.2/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.2/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.2/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.3/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.3/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.3/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.3/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.3/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.3/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.3/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.3/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.3/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.3/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.3/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.3/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.3/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.3/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.3/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.3/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.3/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.3/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.3/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.3/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.3/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.3/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.3/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.3/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.3/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.3/350-index_macro.patch32
-rw-r--r--patches/gcc/4.4.3/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.3/370-bootstrap-target_lib_path.patch40
-rw-r--r--patches/gcc/4.4.3/380-powerpc-libgcc_s-link-libm.patch135
-rw-r--r--patches/gcc/4.4.3/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.3/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.3/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.4/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.4/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.4/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.4/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.4/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.4/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.4/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.4/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.4/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.4/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.4/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.4/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.4/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.4/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.4/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.4/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.4/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.4/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.4/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.4/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.4/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.4/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.4/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.4/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.4/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.4/350-index_macro.patch30
-rw-r--r--patches/gcc/4.4.4/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch38
-rw-r--r--patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch135
-rw-r--r--patches/gcc/4.4.4/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.4/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.4/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.5/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.5/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.5/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.5/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.5/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.5/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.5/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.5/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.5/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.5/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.5/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.5/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.5/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.5/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.5/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.5/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.5/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.5/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.5/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.5/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.5/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.5/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.5/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.5/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.5/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.5/350-index_macro.patch30
-rw-r--r--patches/gcc/4.4.5/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.5/370-bootstrap-target_lib_path.patch38
-rw-r--r--patches/gcc/4.4.5/380-powerpc-libgcc_s-link-libm.patch134
-rw-r--r--patches/gcc/4.4.5/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.5/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.5/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.4.6/100-alpha-mieee-default.patch24
-rw-r--r--patches/gcc/4.4.6/110-trampolinewarn.patch27
-rw-r--r--patches/gcc/4.4.6/120-java-nomulti.patch46
-rw-r--r--patches/gcc/4.4.6/130-cross-compile.patch39
-rw-r--r--patches/gcc/4.4.6/140-default-format-security.patch49
-rw-r--r--patches/gcc/4.4.6/150-default-fortify-source.patch26
-rw-r--r--patches/gcc/4.4.6/160-netbsd-symbolic.patch11
-rw-r--r--patches/gcc/4.4.6/170-sparc64-bsd.patch29
-rw-r--r--patches/gcc/4.4.6/180-libgomp-no-werror.patch12
-rw-r--r--patches/gcc/4.4.6/190-flatten-switch-stmt-00.patch24
-rw-r--r--patches/gcc/4.4.6/200-libiberty.h-asprintf.patch15
-rw-r--r--patches/gcc/4.4.6/210-arm-unbreak-armv4t.patch12
-rw-r--r--patches/gcc/4.4.6/220-libiberty-pic.patch11
-rw-r--r--patches/gcc/4.4.6/230-superh-default-multilib.patch12
-rw-r--r--patches/gcc/4.4.6/240-libstdc++-pic.patch53
-rw-r--r--patches/gcc/4.4.6/250-ia64-noteGNUstack.patch79
-rw-r--r--patches/gcc/4.4.6/260-sh-libgcc-stacks.patch25
-rw-r--r--patches/gcc/4.4.6/270-sh-pr24836.patch24
-rw-r--r--patches/gcc/4.4.6/280-freebsd.patch94
-rw-r--r--patches/gcc/4.4.6/290-freebsd.patch64
-rw-r--r--patches/gcc/4.4.6/300-uclibc-conf.patch35
-rw-r--r--patches/gcc/4.4.6/310-missing-execinfo_h.patch12
-rw-r--r--patches/gcc/4.4.6/320-c99-snprintf.patch12
-rw-r--r--patches/gcc/4.4.6/330-libmudflap-susv3-legacy.patch48
-rw-r--r--patches/gcc/4.4.6/340-ecjx-host-cc.patch13
-rw-r--r--patches/gcc/4.4.6/350-index_macro.patch30
-rw-r--r--patches/gcc/4.4.6/360-arm-bigendian.patch32
-rw-r--r--patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch38
-rw-r--r--patches/gcc/4.4.6/380-powerpc-libgcc_s-link-libm.patch134
-rw-r--r--patches/gcc/4.4.6/390-arm-softfloat-libgcc.patch38
-rw-r--r--patches/gcc/4.4.6/400-pr42289-fix-libffi-build-on-arm-oabi.patch11
-rw-r--r--patches/gcc/4.4.6/410-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.5.0/100-ecjx-host.patch13
-rw-r--r--patches/gcc/4.5.0/110-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.5.1/100-ecjx-host.patch13
-rw-r--r--patches/gcc/4.5.1/110-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.5.2/100-ecjx-host.patch13
-rw-r--r--patches/gcc/4.5.2/110-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.5.3/120-siginfo.patch112
-rw-r--r--patches/gcc/4.5.4/100-ecjx-host.patch (renamed from patches/gcc/4.5.3/100-ecjx-host.patch)0
-rw-r--r--patches/gcc/4.5.4/110-libgcc_eh.a.patch (renamed from patches/gcc/4.5.3/110-libgcc_eh.a.patch)0
-rw-r--r--patches/gcc/4.6.0/000-gcc-bug-54369.patch33
-rw-r--r--patches/gcc/4.6.0/100-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.6.1/000-gcc-bug-54369.patch33
-rw-r--r--patches/gcc/4.6.1/100-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.6.2/000-gcc-bug-54369.patch45
-rw-r--r--patches/gcc/4.6.2/100-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.6.3/000-gcc-bug-54369.patch45
-rw-r--r--patches/gcc/4.6.3/100-libgcc_eh.a.patch39
-rw-r--r--patches/gcc/4.7.0/000-gcc-bug-54369.patch45
-rw-r--r--patches/gcc/4.7.0/001-gcc-bug-54494.patch37
-rw-r--r--patches/gcc/4.7.0/100-PR52734-tree-ssa-tail-merge.patch91
-rw-r--r--patches/gcc/4.7.2/000-libitm-fix-definition-of-__m64.patch27
-rw-r--r--patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch27
-rw-r--r--patches/gcc/4.7.3/100-fix-PR-target-58595.patch102
-rw-r--r--patches/gcc/4.8.0/001_gcc_4_8_0_backport_patches_to_fix_parallel_build_fail_PR_57683.patch26
-rw-r--r--patches/gcc/4.8.1/001_gcc_4_8_1_backport_patches_to_fix_parallel_build_fail_PR_57683.patch26
-rw-r--r--patches/gcc/4.8.2/001_gcc_4_8_2_backport_patches_to_fix_parallel_build_fail_PR_57683.patch26
-rw-r--r--patches/gcc/4.8.2/100-arm_expand_epilogue_apcs_frame-emit-blockage.patch29
-rw-r--r--patches/gcc/4.8.2/110-fix-PR-target-58595.patch101
-rw-r--r--patches/gcc/5.1.0/100-libitm-fixes-for-musl-support.patch65
-rw-r--r--patches/gcc/5.1.0/101-fixincludes-update-for-musl-support.patch32
-rw-r--r--patches/gcc/5.1.0/102-unwind-fix-for-musl.patch36
-rw-r--r--patches/gcc/5.1.0/103-libstdc++-libgfortran-gthr-workaround-for-musl.patch80
-rw-r--r--patches/gcc/5.1.0/104-musl-libc-config.patch321
-rw-r--r--patches/gcc/5.1.0/105-add-musl-support-to-gcc.patch130
-rw-r--r--patches/gcc/5.1.0/106-mips-musl-support.patch38
-rw-r--r--patches/gcc/5.1.0/107-x86-musl-support.patch45
-rw-r--r--patches/gcc/5.1.0/108-arm-musl-support.patch45
-rw-r--r--patches/gcc/5.1.0/109-aarch64-musl-support.patch33
-rw-r--r--patches/newlib/1.17.0/100-avr32.patch32450
-rw-r--r--patches/uClibc/0.9.30.2/190-avr32-add-varargs-handling-of-prctl-syscall.patch74
-rw-r--r--patches/uClibc/0.9.30.2/200-clean-up-O_CLOEXEC-handling.patch297
-rw-r--r--patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch393
546 files changed, 0 insertions, 165782 deletions
diff --git a/patches/binutils/2.18a/130-avr32-atmel-v1.0.1.patch b/patches/binutils/2.18a/130-avr32-atmel-v1.0.1.patch
deleted file mode 100644
index bb47ef9..0000000
--- a/patches/binutils/2.18a/130-avr32-atmel-v1.0.1.patch
+++ /dev/null
@@ -1,52747 +0,0 @@
---- a/bfd/archures.c
-+++ b/bfd/archures.c
-@@ -346,6 +346,11 @@ DESCRIPTION
- .#define bfd_mach_avr4 4
- .#define bfd_mach_avr5 5
- .#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
- . bfd_arch_bfin, {* ADI Blackfin *}
- .#define bfd_mach_bfin 1
- . bfd_arch_cr16, {* National Semiconductor CompactRISC (ie CR16). *}
-@@ -438,6 +443,7 @@ extern const bfd_arch_info_type bfd_alph
- 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;
-@@ -509,6 +515,7 @@ static const bfd_arch_info_type * const
- &bfd_arc_arch,
- &bfd_arm_arch,
- &bfd_avr_arch,
-+ &bfd_avr32_arch,
- &bfd_bfin_arch,
- &bfd_cr16_arch,
- &bfd_cr16c_arch,
---- a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -335,6 +335,10 @@ case "${targ}" in
- targ_underscore=yes
- ;;
-
-+ avr32-*-*)
-+ targ_defvec=bfd_elf32_avr32_vec
-+ ;;
-+
- c30-*-*aout* | tic30-*-*aout*)
- targ_defvec=tic30_aout_vec
- ;;
---- a/bfd/configure.in
-+++ b/bfd/configure.in
-@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c])
- AC_CANONICAL_TARGET
- AC_ISC_POSIX
-
--AM_INIT_AUTOMAKE(bfd, 2.18)
-+AM_INIT_AUTOMAKE(bfd, 2.18.atmel.1.0.1.avr32linux.1)
-
- dnl These must be called before AM_PROG_LIBTOOL, because it may want
- dnl to call AC_CHECK_PROG.
-@@ -619,6 +619,7 @@ do
- bfd_efi_app_ia64_vec) tb="$tb efi-app-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
- bfd_elf32_am33lin_vec) tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
- 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" ;;
---- /dev/null
-+++ b/bfd/cpu-avr32.c
-@@ -0,0 +1,51 @@
-+/* BFD library support routines for AVR32.
-+ Copyright 2003-2006 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, NULL),
-+};
-+
-+const bfd_arch_info_type bfd_avr32_arch =
-+ N(bfd_mach_avr32_ap, "avr32", TRUE, &cpu_info[0]);
---- /dev/null
-+++ b/bfd/elf32-avr32.c
-@@ -0,0 +1,3915 @@
-+/* AVR32-specific support for 32-bit ELF.
-+ Copyright 2003-2006 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)))
-+ {
-+ 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 0x1000
-+
-+#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"
---- /dev/null
-+++ b/bfd/elf32-avr32.h
-@@ -0,0 +1,23 @@
-+/* AVR32-specific support for 32-bit ELF.
-+ Copyright 2007 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);
---- a/bfd/elf-bfd.h
-+++ b/bfd/elf-bfd.h
-@@ -1400,6 +1400,10 @@ struct elf_obj_tdata
- 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;
-
---- a/bfd/Makefile.am
-+++ b/bfd/Makefile.am
-@@ -63,6 +63,7 @@ ALL_MACHINES = \
- cpu-arc.lo \
- cpu-arm.lo \
- cpu-avr.lo \
-+ cpu-avr32.lo \
- cpu-bfin.lo \
- cpu-cr16.lo \
- cpu-cr16c.lo \
-@@ -243,6 +244,7 @@ BFD32_BACKENDS = \
- elf32-arc.lo \
- elf32-arm.lo \
- elf32-avr.lo \
-+ elf32-avr32.lo \
- elf32-bfin.lo \
- elf32-cr16.lo \
- elf32-cr16c.lo \
-@@ -1328,6 +1330,10 @@ elf32-cr16.lo: elf32-cr16.c $(INCDIR)/fi
- $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/cr16.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-+elf32-avr32.lo: elf32-avr32.c $(INCDIR)/filenames.h elf-bfd.h \
-+ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+ $(INCDIR)/bfdlink.h $(INCDIR)/elf/avr32.h $(INCDIR)/elf/reloc-macros.h \
-+ elf32-target.h
- elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
- $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
---- a/bfd/reloc.c
-+++ b/bfd/reloc.c
-@@ -3948,6 +3948,131 @@ ENUMDOC
- instructions
-
- 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.
---- a/bfd/targets.c
-+++ b/bfd/targets.c
-@@ -564,6 +564,7 @@ extern const bfd_target bfd_efi_app_ia32
- extern const bfd_target bfd_efi_app_x86_64_vec;
- extern const bfd_target bfd_efi_app_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;
-@@ -884,6 +885,7 @@ static const bfd_target * const _bfd_tar
- &bfd_efi_app_ia64_vec,
- #endif
- &bfd_elf32_avr_vec,
-+ &bfd_elf32_avr32_vec,
- &bfd_elf32_bfin_vec,
- &bfd_elf32_bfinfdpic_vec,
-
---- a/binutils/Makefile.am
-+++ b/binutils/Makefile.am
-@@ -577,7 +577,7 @@ readelf.o: readelf.c sysdep.h $(INCDIR)/
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h dwarf.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
-- $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h \
-+ $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/avr32.h\
- $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cris.h $(INCDIR)/elf/crx.h \
- $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
- $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/hppa.h \
---- a/binutils/readelf.c
-+++ b/binutils/readelf.c
-@@ -21,7 +21,7 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
- 02110-1301, USA. */
--
-+
- /* The difference between readelf and objdump:
-
- Both programs are capable of displaying the contents of ELF format files,
-@@ -40,7 +40,7 @@
- There is also the case that readelf can provide more information about an
- ELF file than is provided by objdump. In particular it can display DWARF
- debugging information which (at the moment) objdump cannot. */
--
-+
- #include "sysdep.h"
- #include <assert.h>
- #include <sys/stat.h>
-@@ -109,6 +109,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"
-@@ -303,7 +304,7 @@ static void (*byte_put) (unsigned char *
- #define streq(a,b) (strcmp ((a), (b)) == 0)
- #define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
- #define const_strneq(a,b) (strncmp ((a), (b), sizeof (b) - 1) == 0)
--
-+
- static void *
- get_data (void *var, FILE *file, long offset, size_t size, size_t nmemb,
- const char *reason)
-@@ -614,6 +615,7 @@ guess_is_rela (unsigned long e_machine)
- case EM_ALPHA:
- case EM_ALTERA_NIOS2:
- case EM_AVR:
-+ case EM_AVR32:
- case EM_AVR_OLD:
- case EM_BLACKFIN:
- case EM_CR16:
-@@ -1006,6 +1008,10 @@ dump_relocations (FILE *file,
- 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:
-@@ -1763,6 +1769,7 @@ get_machine_name (unsigned e_machine)
- case EM_VAX: return "Digital VAX";
- case EM_AVR_OLD:
- case EM_AVR: return "Atmel AVR 8-bit microcontroller";
-+ case EM_AVR32: return "Atmel AVR32";
- case EM_CRIS: return "Axis Communications 32-bit embedded processor";
- case EM_JAVELIN: return "Infineon Technologies 32-bit embedded cpu";
- case EM_FIREPATH: return "Element 14 64-bit DSP processor";
---- a/gas/as.c
-+++ b/gas/as.c
-@@ -441,10 +441,10 @@ parse_args (int * pargc, char *** pargv)
- the end of the preceeding line so that it is simpler to
- selectively add and remove lines from this list. */
- {"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}
-@@ -803,8 +803,15 @@ This program has absolutely no warranty.
- case 'a':
- if (optarg)
- {
-- if (optarg != old_argv[optind] && optarg[-1] == '=')
-- --optarg;
-+ /* 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;
-@@ -1234,7 +1241,7 @@ main (int argc, char ** argv)
- keep_it = 0;
-
- if (!keep_it)
-- unlink_if_ordinary (out_file_name);
-+ unlink (out_file_name);
-
- input_scrub_end ();
-
---- /dev/null
-+++ b/gas/config/tc-avr32.c
-@@ -0,0 +1,4806 @@
-+/* Assembler implementation for AVR32.
-+ Copyright 2003-2006 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,
-+};
-+
-+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},
-+ {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_FP | 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},
-+ {"uc3b164", ARCH_TYPE_UCR1},
-+ {"uc3b1128", ARCH_TYPE_UCR1},
-+ {"uc3b1256es", ARCH_TYPE_UCR1},
-+ {"uc3b1256", ARCH_TYPE_UCR1},
-+ {NULL, 0}
-+};
-+
-+/* Current architecture type. */
-+static struct arch_type_s default_arch = {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_FP | 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, _("Known architecture names:"));
-+ 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. "
-+ "Converting 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;
-+}
-+
-+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;
-+}
-+
-+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
-+
-+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;
-+}
-+
-+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(FPREG_S, 0, 0, 0, fpreg),
-+ OP(FPREG_D, 0, 0, 1, fpreg),
-+ 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)
-+ };
-+
-+#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
-+ */
---- /dev/null
-+++ b/gas/config/tc-avr32.h
-@@ -0,0 +1,325 @@
-+/* Assembler definitions for AVR32.
-+ Copyright 2003-2006 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() 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)
---- a/gas/configure.tgt
-+++ b/gas/configure.tgt
-@@ -33,6 +33,7 @@ case ${cpu} in
- am33_2.0) cpu_type=mn10300 endian=little ;;
- arm*be|arm*b) cpu_type=arm endian=big ;;
- 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 ;;
-@@ -129,6 +130,9 @@ case ${generic_target} in
- bfin-*elf) fmt=elf ;;
- 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 ;;
---- a/gas/doc/all.texi
-+++ b/gas/doc/all.texi
-@@ -30,6 +30,7 @@
- @set ARC
- @set ARM
- @set AVR
-+@set AVR32
- @set BFIN
- @set CR16
- @set CRIS
---- a/gas/doc/as.texinfo
-+++ b/gas/doc/as.texinfo
-@@ -6353,6 +6353,9 @@ subject, see the hardware manufacturer's
- @ifset AVR
- * AVR-Dependent:: AVR Dependent Features
- @end ifset
-+@ifset AVR32
-+* AVR32-Dependent:: AVR32 Dependent Features
-+@end ifset
- @ifset BFIN
- * BFIN-Dependent:: BFIN Dependent Features
- @end ifset
-@@ -6476,6 +6479,10 @@ subject, see the hardware manufacturer's
- @include c-avr.texi
- @end ifset
-
-+@ifset AVR32
-+@include c-avr32.texi
-+@end ifset
-+
- @ifset BFIN
- @include c-bfin.texi
- @end ifset
---- /dev/null
-+++ b/gas/doc/c-avr32.texi
-@@ -0,0 +1,247 @@
-+@c Copyright 2005, 2006
-+@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
-+
-+There are currently no AVR32-specific options. However, the following
-+options are planned:
-+
-+@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
---- a/gas/doc/Makefile.am
-+++ b/gas/doc/Makefile.am
-@@ -33,6 +33,7 @@ CPU_DOCS = \
- c-arc.texi \
- c-arm.texi \
- c-avr.texi \
-+ c-avr32.texi \
- c-bfin.texi \
- c-cr16.texi \
- c-d10v.texi \
---- a/gas/Makefile.am
-+++ b/gas/Makefile.am
-@@ -47,6 +47,7 @@ CPU_TYPES = \
- arc \
- arm \
- avr \
-+ avr32 \
- bfin \
- cr16 \
- cris \
-@@ -241,6 +242,7 @@ TARGET_CPU_CFILES = \
- 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 \
-@@ -296,6 +298,7 @@ TARGET_CPU_HFILES = \
- 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 \
-@@ -1050,6 +1053,11 @@ DEPTC_avr_elf = $(srcdir)/config/obj-elf
- $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h dwarf2dbg.h \
- $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
- $(INCDIR)/opcode/avr.h
-+DEPTC_avr32_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
-+ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-+ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr32.h \
-+ $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
-+ $(srcdir)/../opcodes/avr32-opc.h $(srcdir)/../opcodes/avr32-asm.h
- DEPTC_bfin_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/bfdlink.h $(srcdir)/config/tc-bfin.h dwarf2dbg.h \
-@@ -1487,6 +1495,11 @@ DEPOBJ_avr_elf = $(srcdir)/config/obj-el
- $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h dwarf2dbg.h \
- $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
- $(INCDIR)/obstack.h struc-symbol.h dwarf2dbg.h $(INCDIR)/aout/aout64.h
-+DEPOBJ_avr32_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
-+ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-+ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr32.h \
-+ $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
-+ struc-symbol.h dwarf2dbg.h
- DEPOBJ_bfin_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/bfdlink.h $(srcdir)/config/tc-bfin.h dwarf2dbg.h \
-@@ -1858,6 +1871,9 @@ DEP_cr16_elf = $(srcdir)/config/obj-elf.
- $(INCDIR)/bfdlink.h $(srcdir)/config/tc-cr16.h dwarf2dbg.h \
- $(srcdir)/config/obj-coff.h $(INCDIR)/coff/internal.h \
- $(BFDDIR)/libcoff.h
-+DEP_avr32_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \
-+ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-+ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr32.h
- DEP_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
- $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
- DEP_cris_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/aliases.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/aliases.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/allinsn.d
-@@ -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
-+
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/allinsn.exp
-@@ -0,0 +1,5 @@
-+# AVR32 assembler testsuite. -*- Tcl -*-
-+
-+if [istarget avr32-*-*] {
-+ run_dump_test "allinsn"
-+}
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/allinsn.s
-@@ -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
-+
-+
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/avr32.exp
-@@ -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"
-+}
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/call_nopic.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/call_pic.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/call_pic_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/call.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/dwarf2.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/dwarf2.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/fpinsn.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/fpinsn.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/hwrd-lwrd.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/hwrd-lwrd.s
-@@ -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:
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/jmptable.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/jmptable_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/jmptable.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/lda_nopic.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/lda_pic.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/lda.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pcrel.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pcrel.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pico.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pico.s
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pic_reloc.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/pic_reloc.s
-@@ -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:
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/symdiff.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/symdiff_linkrelax.d
-@@ -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
---- /dev/null
-+++ b/gas/testsuite/gas/avr32/symdiff.s
-@@ -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
---- a/gas/write.c
-+++ b/gas/write.c
-@@ -1955,6 +1955,10 @@ relax_frag (segT segment, fragS *fragP,
-
- #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
-@@ -1974,6 +1978,7 @@ relax_align (register relax_addressT add
- #endif
- return (new_address - address);
- }
-+#endif
-
- /* Now we have a segment, not a crowd of sub-segments, we can make
- fr_address values.
-@@ -2017,7 +2022,7 @@ relax_segment (struct frag *segment_frag
- 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;
-@@ -2218,10 +2223,10 @@ relax_segment (struct frag *segment_frag
- {
- 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)
- {
---- a/include/dis-asm.h
-+++ b/include/dis-asm.h
-@@ -204,13 +204,14 @@ typedef struct disassemble_info
-
- } disassemble_info;
-
--
-+
- /* Standard disassemblers. Disassemble one instruction at the given
- target address. Return number of octets processed. */
- typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
-
- 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 *);
-@@ -242,7 +243,7 @@ extern int print_insn_little_arm (bfd_vm
- extern int print_insn_little_mips (bfd_vma, disassemble_info *);
- extern int print_insn_little_or32 (bfd_vma, disassemble_info *);
- extern int print_insn_little_powerpc (bfd_vma, disassemble_info *);
--extern int print_insn_little_score (bfd_vma, disassemble_info *);
-+extern int print_insn_little_score (bfd_vma, disassemble_info *);
- extern int print_insn_m32c (bfd_vma, disassemble_info *);
- extern int print_insn_m32r (bfd_vma, disassemble_info *);
- extern int print_insn_m68hc11 (bfd_vma, disassemble_info *);
-@@ -290,7 +291,9 @@ extern void print_i386_disassembler_opti
- 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 int get_arm_regname_num_options (void);
- extern int set_arm_regname_option (int);
- extern int get_arm_regnames (int, const char **, const char **, const char *const **);
-@@ -306,7 +309,7 @@ extern void disassemble_init_for_target
- /* Document any target specific options available from the disassembler. */
- extern void disassembler_usage (FILE *);
-
--
-+
- /* This block of definitions is for particular callers who read instructions
- into a buffer before calling the instruction decoder. */
-
---- /dev/null
-+++ b/include/elf/avr32.h
-@@ -0,0 +1,98 @@
-+/* AVR32 ELF support for BFD.
-+ Copyright 2003-2006 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
---- a/include/elf/common.h
-+++ b/include/elf/common.h
-@@ -259,6 +259,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
-
---- a/ld/configdoc.texi
-+++ b/ld/configdoc.texi
-@@ -7,6 +7,7 @@
- @set H8300
- @set HPPA
- @set I960
-+@set AVR32
- @set M68HC11
- @set MMIX
- @set MSP430
---- a/ld/configure.tgt
-+++ b/ld/configure.tgt
-@@ -109,6 +109,9 @@ xscale-*-elf) targ_emul=armelf
- avr-*-*) targ_emul=avr2
- targ_extra_emuls="avr1 avr3 avr4 avr5 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_uc3b164 avr32elf_uc3b1128 avr32elf_uc3b1256es avr32elf_uc3b1256" ;;
-+avr32-*-linux*) targ_emul=avr32linux ;;
- bfin-*-elf) targ_emul=elf32bfin;
- targ_extra_emuls="elf32bfinfd"
- targ_extra_libpath=$targ_extra_emuls
---- /dev/null
-+++ b/ld/emulparams/avr32elf.sh
-@@ -0,0 +1,163 @@
-+# 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=elf_xip
-+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=0x1000
-+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_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_uc3a[01]512*)
-+ MEMORY="MEMORY
-+ {
-+ FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
-+ CPUSRAM (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 64K
-+ USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+ FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+ }"
-+ ;;
-+
-+ avr32elf_uc3a[01]256)
-+ MEMORY="MEMORY
-+ {
-+ FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+ CPUSRAM (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 64K
-+ 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 = 0x00000000, LENGTH = 32K
-+ USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+ FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+ }"
-+ ;;
-+
-+ avr32elf_uc3[ab][01]128)
-+ MEMORY="MEMORY
-+ {
-+ FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
-+ CPUSRAM (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 32K
-+ USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+ FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+ }"
-+ ;;
-+
-+ avr32elf_uc3b[01]64)
-+ MEMORY="MEMORY
-+ {
-+ FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+ CPUSRAM (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 16K
-+ 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 = 0x00000000, LENGTH = 64K
-+ 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 = 0x00000000, LENGTH = 64K
-+ 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 = 0x00000000, LENGTH = 64K
-+ 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
-+"
-+ ;;
-+
-+
-+ esac
-+ ;;
-+
-+esac
---- /dev/null
-+++ b/ld/emulparams/avr32linux.sh
-@@ -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
---- /dev/null
-+++ b/ld/emultempl/avr32elf.em
-@@ -0,0 +1,133 @@
-+# This shell script emits a C file. -*- C -*-
-+# Copyright (C) 2007 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 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
-+'
-+
-+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 },
-+'
-+
-+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"));
-+'
-+
-+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;
-+'
-+
-+# 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
---- a/ld/ld.info
-+++ b/ld/ld.info
-@@ -4347,6 +4347,8 @@ not listed.
-
- * ARM:: `ld' and the ARM family
-
-+* AVR32:: `ld' and AVR32 processors
-+
- * HPPA ELF32:: `ld' and HPPA 32-bit ELF
-
- * MMIX:: `ld' and MMIX
-@@ -4487,7 +4489,7 @@ PIC. This avoids problems on uClinux ta
- used to generate relocatable binaries.
-
- 
--File: ld.info, Node: ARM, Next: HPPA ELF32, Prev: i960, Up: Machine Dependent
-+File: ld.info, Node: ARM, Next: AV32, Prev: i960, Up: Machine Dependent
-
- 4.4 `ld' and the ARM family
- ===========================
-@@ -4588,7 +4590,31 @@ enumeration values fitted into the small
- diagnosed.
-
- 
--File: ld.info, Node: HPPA ELF32, Next: MMIX, Prev: ARM, Up: Machine Dependent
-+File: ld.info, Node: AVR32, Next: HPPA ELF32, Prev: ARM, Up: Machine Dependent
-+
-+4.4 `ld' and AVR32 processors
-+=============================
-+
-+`--direct-data'
-+
-+`--no-direct-data'
-+ Taking the address of a symbol can often be done by using a direct
-+ `mov' or pc-relative `sub' instruction, which is faster than using
-+ a PC- or GOT-relative load, especially on the uC3 processors.
-+ However, this does not always work when dealing with symbols in
-+ the `.data' section so this optimization is disabled by default.
-+
-+ Specifying `--direct-data' will enable this optimization. Note
-+ that this may cause `relocation truncated to fit' errors for
-+ certain large programs. If this happens, the optimization can be
-+ turned off by specifying `--no-direct-data'.
-+
-+ All known issues with direct data optimizations are detected at
-+ link time, so if the linker doesn't complain, the result should
-+ run just fine.
-+
-+
-+File: ld.info, Node: HPPA ELF32, Next: MMIX, Prev: AVR32, Up: Machine Dependent
-
- 4.5 `ld' and HPPA 32-bit ELF Support
- ====================================
-@@ -6336,6 +6362,7 @@ LD Index
- * --no-check-sections: Options. (line 765)
- * --no-define-common: Options. (line 787)
- * --no-demangle: Options. (line 816)
-+* --no-direct-data: AVR32. (line 6)
- * --no-dotsyms: PowerPC64 ELF64. (line 33)
- * --no-enum-size-warning: ARM. (line 94)
- * --no-gc-sections: Options. (line 848)
-@@ -6534,6 +6561,7 @@ LD Index
- * AT(LMA): Output Section LMA. (line 6)
- * AT>LMA_REGION: Output Section LMA. (line 6)
- * automatic data imports: WIN32. (line 170)
-+* AVR32 options: AVR32. (line 6)
- * back end: BFD. (line 6)
- * BASE (MRI): MRI. (line 54)
- * BE8: ARM. (line 23)
-@@ -7018,6 +7046,7 @@ Node: H8/300183897
- Node: i960185522
- Node: M68HC11/68HC12187207
- Node: ARM188910
-+Node: AVR32182578
- Node: HPPA ELF32193760
- Node: MMIX195383
- Node: MSP430196600
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -21,6 +21,7 @@
- @set UsesEnvVars
- @set GENERIC
- @set ARM
-+@set AVR32
- @set H8300
- @set HPPA
- @set I960
-@@ -139,6 +140,9 @@ section entitled ``GNU Free Documentatio
- @ifset ARM
- * ARM:: ld and the ARM family
- @end ifset
-+@ifset AVR32
-+* AVR32:: ld and AVR32 processors
-+@end ifset
- @ifset HPPA
- * HPPA ELF32:: ld and HPPA 32-bit ELF
- @end ifset
-@@ -5248,6 +5252,9 @@ functionality are not listed.
- @ifset ARM
- * ARM:: @command{ld} and the ARM family
- @end ifset
-+@ifset AVR32
-+* AVR32:: @command{ld} and AVR32 processors
-+@end ifset
- @ifset HPPA
- * HPPA ELF32:: @command{ld} and HPPA 32-bit ELF
- @end ifset
-@@ -5589,6 +5596,52 @@ not be diagnosed.
- @end ifclear
- @end ifset
-
-+@ifset AVR32
-+@ifclear GENERIC
-+@raisesections
-+@end ifclear
-+
-+@node AVR32
-+@section @command{ld} and AVR32 processors
-+@cindex AVR32 options
-+@table @option
-+@kindex --direct-data
-+@kindex --no-direct-data
-+@item --direct-data
-+@item --no-direct-data
-+Taking the address of a symbol can often be done by using a direct
-+@code{mov} or pc-relative @code{sub} instruction, which is faster than
-+using a PC- or GOT-relative load, especially on the uC3
-+processors. However, this does not always work when dealing with
-+symbols in the @code{.data} section so this optimization is disabled
-+by default.
-+
-+Specifying @option{--direct-data} will enable this optimization. Note
-+that this may cause @samp{relocation truncated to fit} errors for
-+certain large programs. If this happens, the optimization can be
-+turned off by specifying @option{--no-direct-data}.
-+
-+All known issues with direct data optimizations are detected at link
-+time, so if the linker doesn't complain, the result should run just
-+fine.
-+
-+@kindex --rodata-writable
-+@kindex --no-rodata-writable
-+@item --rodata-writable
-+@item --no-rodata-writable
-+Using the @option{--rodata-writable} options will cause the linker
-+to try and use a linker script where read-only data will be placed
-+in the same section as writable data. This can give great performance
-+gain on cacheless processors where read-only data normally is placed in
-+flash, and writable data is placed in internal sram. This will however
-+come at the expence of a larger memory footprint.
-+@end table
-+
-+@ifclear GENERIC
-+@lowersections
-+@end ifclear
-+@end ifset
-+
- @ifset HPPA
- @ifclear GENERIC
- @raisesections
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -137,7 +137,34 @@ ALL_EMULATIONS = \
- eavr3.o \
- eavr4.o \
- eavr5.o \
-- eavr6.o \
-+ eavr6.o \
-+ 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_uc3b164.o \
-+ eavr32elf_uc3b1128.o \
-+ eavr32elf_uc3b1256es.o \
-+ eavr32elf_uc3b1256.o \
-+ eavr32linux.o \
- ecoff_i860.o \
- ecoff_sparc.o \
- eelf32_spu.o \
-@@ -622,6 +649,114 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
- $(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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
-+ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+ $(srcdir)/scripttempl/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} avr32elf_uc3b1256es "$(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)"
-@@ -1877,7 +2012,9 @@ install-exec-local: ld-new$(EXEEXT)
- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
- 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 ; \
---- /dev/null
-+++ b/ld/scripttempl/elf_xip.sc
-@@ -0,0 +1,456 @@
-+#
-+# 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}"
-+else
-+ RO_REGION=""
-+ RW_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_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_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};}}}
-+ ${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_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_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
---- /dev/null
-+++ b/ld/testsuite/ld-avr32/avr32.exp
-@@ -0,0 +1,25 @@
-+# Expect script for AVR32 ELF linker tests.
-+# Copyright 2004-2006 Atmel Corporation.
-+#
-+# 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"
---- /dev/null
-+++ b/ld/testsuite/ld-avr32/pcrel.d
-@@ -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
---- /dev/null
-+++ b/ld/testsuite/ld-avr32/pcrel.ld
-@@ -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)
-+ }
-+}
---- /dev/null
-+++ b/ld/testsuite/ld-avr32/symbols.s
-@@ -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
---- /dev/null
-+++ b/opcodes/avr32-asm.c
-@@ -0,0 +1,264 @@
-+/* Assembler interface for AVR32.
-+ Copyright 2005, 2006 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]))
-+
-+/* Floating-point Registers. */
-+static const struct reg_entry fr_table[] =
-+ {
-+ { "fr0", 0 }, { "fr1", 1 }, { "fr2", 2 }, { "fr3", 3 },
-+ { "fr4", 4 }, { "fr5", 5 }, { "fr6", 6 }, { "fr7", 7 },
-+ { "fr8", 8 }, { "fr9", 9 }, { "fr10", 10 }, { "fr11", 11 },
-+ { "fr12", 12 }, { "fr13", 13 }, { "fr14", 14 }, { "fr15", 15 },
-+ };
-+#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_fpreg(const char *str)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < AVR32_NR_FPREGS; i++)
-+ {
-+ if (strcasecmp(fr_table[i].name, str) == 0)
-+ return fr_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
---- /dev/null
-+++ b/opcodes/avr32-asm.h
-@@ -0,0 +1,42 @@
-+/* Assembler interface for AVR32.
-+ Copyright 2005, 2006 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_fpreg(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 */
---- /dev/null
-+++ b/opcodes/avr32-dis.c
-@@ -0,0 +1,891 @@
-+/* Print AVR32 instructions for GDB and objdump.
-+ Copyright 2005, 2006 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 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]);
-+ }
-+}
-+
-+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)
-+ 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;
-+
-+ /* 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)
-+{
-+
-+}
---- /dev/null
-+++ b/opcodes/avr32-opc.c
-@@ -0,0 +1,6932 @@
-+/* Opcode tables for AVR32.
-+ Copyright 2005, 2006 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),
-+ };
-+#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],
-+ },
-+ },
-+
-+ };
-+
-+#define FPALIAS_DXY(name, opcode) \
-+ { \
-+ AVR32_ALIAS_##name##_S, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 1, 0 }, { 1, 1 }, { 1, 2 }, \
-+ { 0, opcode }, \
-+ }, \
-+ }, { \
-+ AVR32_ALIAS_##name##_D, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 1, 0 }, { 1, 1 }, { 1, 2 }, \
-+ { 0, (opcode) | 0x40 }, \
-+ }, \
-+ }
-+#define FPALIAS_DX(name, opcode) \
-+ { \
-+ AVR32_ALIAS_##name##_S, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 1, 0 }, { 1, 1 }, { 0, 0 }, \
-+ { 0, opcode }, \
-+ }, \
-+ }, { \
-+ AVR32_ALIAS_##name##_D, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 1, 0 }, { 1, 1 }, { 0, 0 }, \
-+ { 0, (opcode) | 0x40 }, \
-+ }, \
-+ }
-+#define FPALIAS_XY(name, opcode) \
-+ { \
-+ AVR32_ALIAS_##name##_S, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 0, 0 }, { 1, 0 }, { 1, 1 }, \
-+ { 0, opcode }, \
-+ }, \
-+ }, { \
-+ AVR32_ALIAS_##name##_D, \
-+ &avr32_opc_table[AVR32_OPC_COP], \
-+ { \
-+ { 0, 0 }, \
-+ { 0, 0 }, { 1, 0 }, { 1, 1 }, \
-+ { 0, (opcode) | 0x40 }, \
-+ }, \
-+ }
-+
-+const struct avr32_alias avr32_alias_table[] =
-+ {
-+ FPALIAS_DXY(FMAC, 0x00),
-+ FPALIAS_DXY(FNMAC, 0x01),
-+ FPALIAS_DXY(FMSC, 0x02),
-+ FPALIAS_DXY(FNMSC, 0x03),
-+ FPALIAS_DXY(FADD, 0x04),
-+ FPALIAS_DXY(FSUB, 0x05),
-+ FPALIAS_DXY(FMUL, 0x06),
-+ FPALIAS_DXY(FNMUL, 0x07),
-+ FPALIAS_DX(FNEG, 0x08),
-+ FPALIAS_DX(FABS, 0x09),
-+ FPALIAS_XY(FCMP, 0x0d),
-+ FPALIAS_DX(FMOV1, 0x0a),
-+ {
-+ AVR32_ALIAS_FMOV2_S,
-+ &avr32_opc_table[AVR32_OPC_MVCR_W],
-+ { { 0, 0 }, { 1, 0 }, { 1, 1 }, },
-+ },
-+ {
-+ AVR32_ALIAS_FMOV2_D,
-+ &avr32_opc_table[AVR32_OPC_MVCR_D],
-+ { { 0, 0 }, { 1, 0 }, { 1, 1 }, },
-+ },
-+ {
-+ AVR32_ALIAS_FMOV3_S,
-+ &avr32_opc_table[AVR32_OPC_MVRC_W],
-+ { { 0, 0 }, { 1, 0 }, { 1, 1 }, },
-+ },
-+ {
-+ AVR32_ALIAS_FMOV3_D,
-+ &avr32_opc_table[AVR32_OPC_MVRC_D],
-+ { { 0, 0 }, { 1, 0 }, { 1, 1 }, },
-+ },
-+ {
-+ AVR32_ALIAS_FCASTS_D,
-+ &avr32_opc_table[AVR32_OPC_COP],
-+ {
-+ { 0, 0 },
-+ { 1, 0 }, { 1, 1 }, { 0, 0 },
-+ { 0, 0x0f },
-+ },
-+ },
-+ {
-+ AVR32_ALIAS_FCASTD_S,
-+ &avr32_opc_table[AVR32_OPC_COP],
-+ {
-+ { 0, 0 },
-+ { 1, 0 }, { 1, 1 }, { 0, 0 },
-+ { 0, 0x10 },
-+ },
-+ },
-+ {
-+ 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, \
-+ } \
-+ }
-+
-+#define SYNTAX_FP(name, nr_ops) \
-+ { \
-+ AVR32_SYNTAX_##name##_S, \
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS, \
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_##name##_S] }, \
-+ NULL, nr_ops, \
-+ { \
-+ AVR32_OPERAND_FPREG_S, \
-+ AVR32_OPERAND_FPREG_S, \
-+ AVR32_OPERAND_FPREG_S, \
-+ }, \
-+ }, \
-+ { \
-+ AVR32_SYNTAX_##name##_D, \
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS, \
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_##name##_D] }, \
-+ NULL, nr_ops, \
-+ { \
-+ AVR32_OPERAND_FPREG_D, \
-+ AVR32_OPERAND_FPREG_D, \
-+ AVR32_OPERAND_FPREG_D, \
-+ }, \
-+ }
-+
-+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_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_FP(FADD, 3),
-+ SYNTAX_FP(FSUB, 3),
-+ SYNTAX_FP(FMAC, 3),
-+ SYNTAX_FP(FNMAC, 3),
-+ SYNTAX_FP(FMSC, 3),
-+ SYNTAX_FP(FNMSC, 3),
-+ SYNTAX_FP(FMUL, 3),
-+ SYNTAX_FP(FNMUL, 3),
-+ SYNTAX_FP(FNEG, 2),
-+ SYNTAX_FP(FABS, 2),
-+ SYNTAX_FP(FCMP, 2),
-+ {
-+ AVR32_SYNTAX_FMOV1_S,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV1_S] },
-+ &avr32_syntax_table[AVR32_SYNTAX_FMOV2_S],
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_S,
-+ AVR32_OPERAND_FPREG_S,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FMOV1_D,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV1_D] },
-+ &avr32_syntax_table[AVR32_SYNTAX_FMOV2_D],
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_D,
-+ AVR32_OPERAND_FPREG_D,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FMOV2_S,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV2_S] },
-+ &avr32_syntax_table[AVR32_SYNTAX_FMOV3_S],
-+ 2,
-+ {
-+ AVR32_OPERAND_INTREG,
-+ AVR32_OPERAND_FPREG_S,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FMOV2_D,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV2_D] },
-+ &avr32_syntax_table[AVR32_SYNTAX_FMOV3_D],
-+ 2,
-+ {
-+ AVR32_OPERAND_DWREG,
-+ AVR32_OPERAND_FPREG_D,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FMOV3_S,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV3_S] }, NULL,
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_S,
-+ AVR32_OPERAND_INTREG,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FMOV3_D,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FMOV3_D] }, NULL,
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_D,
-+ AVR32_OPERAND_DWREG,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FCASTS_D,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FCASTS_D] }, NULL,
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_S,
-+ AVR32_OPERAND_FPREG_D,
-+ },
-+ },
-+ {
-+ AVR32_SYNTAX_FCASTD_S,
-+ AVR32_FP, NULL, AVR32_PARSER_ALIAS,
-+ { .alias = &avr32_alias_table[AVR32_ALIAS_FCASTD_S] }, NULL,
-+ 2,
-+ {
-+ AVR32_OPERAND_FPREG_D,
-+ AVR32_OPERAND_FPREG_S,
-+ },
-+ },
-+ {
-+ 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(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"),
-+ FP_MNEMONIC(FADD, FADD, "fadd"),
-+ FP_MNEMONIC(FSUB, FSUB, "fsub"),
-+ FP_MNEMONIC(FMAC, FMAC, "fmac"),
-+ FP_MNEMONIC(FNMAC, FNMAC, "fnmac"),
-+ FP_MNEMONIC(FMSC, FMSC, "fmsc"),
-+ FP_MNEMONIC(FNMSC, FNMSC, "fnmsc"),
-+ FP_MNEMONIC(FMUL, FMUL, "fmul"),
-+ FP_MNEMONIC(FNMUL, FNMUL, "fnmul"),
-+ FP_MNEMONIC(FNEG, FNEG, "fneg"),
-+ FP_MNEMONIC(FABS, FABS, "fabs"),
-+ FP_MNEMONIC(FCMP, FCMP, "fcmp"),
-+ FP_MNEMONIC(FMOV, FMOV1, "fmov"),
-+ NORMAL_MNEMONIC(FCASTS_D, FCASTS_D, "fcasts.d"),
-+ NORMAL_MNEMONIC(FCASTD_S, FCASTD_S, "fcastd.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
---- /dev/null
-+++ b/opcodes/avr32-opc.h
-@@ -0,0 +1,2370 @@
-+/* Opcode tables for AVR32.
-+ Copyright 2005, 2006 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_FP (1 << 16)
-+#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_FPREG_S,
-+ AVR32_OPERAND_FPREG_D,
-+ 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__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__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_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_FADD_S,
-+ AVR32_SYNTAX_FADD_D,
-+ AVR32_SYNTAX_FSUB_S,
-+ AVR32_SYNTAX_FSUB_D,
-+ AVR32_SYNTAX_FMAC_S,
-+ AVR32_SYNTAX_FMAC_D,
-+ AVR32_SYNTAX_FNMAC_S,
-+ AVR32_SYNTAX_FNMAC_D,
-+ AVR32_SYNTAX_FMSC_S,
-+ AVR32_SYNTAX_FMSC_D,
-+ AVR32_SYNTAX_FNMSC_S,
-+ AVR32_SYNTAX_FNMSC_D,
-+ AVR32_SYNTAX_FMUL_S,
-+ AVR32_SYNTAX_FMUL_D,
-+ AVR32_SYNTAX_FNMUL_S,
-+ AVR32_SYNTAX_FNMUL_D,
-+ AVR32_SYNTAX_FNEG_S,
-+ AVR32_SYNTAX_FNEG_D,
-+ AVR32_SYNTAX_FABS_S,
-+ AVR32_SYNTAX_FABS_D,
-+ AVR32_SYNTAX_FCMP_S,
-+ AVR32_SYNTAX_FCMP_D,
-+ AVR32_SYNTAX_FMOV1_S,
-+ AVR32_SYNTAX_FMOV1_D,
-+ AVR32_SYNTAX_FMOV2_S,
-+ AVR32_SYNTAX_FMOV2_D,
-+ AVR32_SYNTAX_FMOV3_S,
-+ AVR32_SYNTAX_FMOV3_D,
-+ AVR32_SYNTAX_FCASTS_D,
-+ AVR32_SYNTAX_FCASTD_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_FMAC_S,
-+ AVR32_ALIAS_FMAC_D,
-+ AVR32_ALIAS_FNMAC_S,
-+ AVR32_ALIAS_FNMAC_D,
-+ AVR32_ALIAS_FMSC_S,
-+ AVR32_ALIAS_FMSC_D,
-+ AVR32_ALIAS_FNMSC_S,
-+ AVR32_ALIAS_FNMSC_D,
-+ AVR32_ALIAS_FADD_S,
-+ AVR32_ALIAS_FADD_D,
-+ AVR32_ALIAS_FSUB_S,
-+ AVR32_ALIAS_FSUB_D,
-+ AVR32_ALIAS_FMUL_S,
-+ AVR32_ALIAS_FMUL_D,
-+ AVR32_ALIAS_FNMUL_S,
-+ AVR32_ALIAS_FNMUL_D,
-+ AVR32_ALIAS_FNEG_S,
-+ AVR32_ALIAS_FNEG_D,
-+ AVR32_ALIAS_FABS_S,
-+ AVR32_ALIAS_FABS_D,
-+ AVR32_ALIAS_FCMP_S,
-+ AVR32_ALIAS_FCMP_D,
-+ AVR32_ALIAS_FMOV1_S,
-+ AVR32_ALIAS_FMOV1_D,
-+ AVR32_ALIAS_FMOV2_S,
-+ AVR32_ALIAS_FMOV2_D,
-+ AVR32_ALIAS_FMOV3_S,
-+ AVR32_ALIAS_FMOV3_D,
-+ AVR32_ALIAS_FCASTS_D,
-+ AVR32_ALIAS_FCASTD_S,
-+ 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_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_FADD_S,
-+ AVR32_MNEMONIC_FADD_D,
-+ AVR32_MNEMONIC_FSUB_S,
-+ AVR32_MNEMONIC_FSUB_D,
-+ AVR32_MNEMONIC_FMAC_S,
-+ AVR32_MNEMONIC_FMAC_D,
-+ AVR32_MNEMONIC_FNMAC_S,
-+ AVR32_MNEMONIC_FNMAC_D,
-+ AVR32_MNEMONIC_FMSC_S,
-+ AVR32_MNEMONIC_FMSC_D,
-+ AVR32_MNEMONIC_FNMSC_S,
-+ AVR32_MNEMONIC_FNMSC_D,
-+ AVR32_MNEMONIC_FMUL_S,
-+ AVR32_MNEMONIC_FMUL_D,
-+ AVR32_MNEMONIC_FNMUL_S,
-+ AVR32_MNEMONIC_FNMUL_D,
-+ AVR32_MNEMONIC_FNEG_S,
-+ AVR32_MNEMONIC_FNEG_D,
-+ AVR32_MNEMONIC_FABS_S,
-+ AVR32_MNEMONIC_FABS_D,
-+ AVR32_MNEMONIC_FCMP_S,
-+ AVR32_MNEMONIC_FCMP_D,
-+ AVR32_MNEMONIC_FMOV_S,
-+ AVR32_MNEMONIC_FMOV_D,
-+ AVR32_MNEMONIC_FCASTS_D,
-+ AVR32_MNEMONIC_FCASTD_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_
---- a/opcodes/configure.in
-+++ b/opcodes/configure.in
-@@ -158,6 +158,7 @@ if test x${all_targets} = xfalse ; then
- bfd_arc_arch) ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
- bfd_arm_arch) ta="$ta arm-dis.lo" ;;
- 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" ;;
-@@ -216,7 +217,7 @@ if test x${all_targets} = xfalse ; then
- 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" ;;
---- a/opcodes/disassemble.c
-+++ b/opcodes/disassemble.c
-@@ -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
-@@ -128,6 +129,11 @@ disassembler (abfd)
- 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;
-@@ -346,9 +352,9 @@ disassembler (abfd)
- #ifdef ARCH_score
- case bfd_arch_score:
- if (bfd_big_endian (abfd))
-- disassemble = print_insn_big_score;
-+ disassemble = print_insn_big_score;
- else
-- disassemble = print_insn_little_score;
-+ disassemble = print_insn_little_score;
- break;
- #endif
- #ifdef ARCH_sh
-@@ -466,6 +472,9 @@ disassembler_usage (stream)
- #ifdef ARCH_i386
- print_i386_disassembler_options (stream);
- #endif
-+#ifdef ARCH_avr32
-+ print_avr32_disassembler_options (stream);
-+#endif
-
- return;
- }
---- a/opcodes/Makefile.am
-+++ b/opcodes/Makefile.am
-@@ -30,6 +30,7 @@ LIBIBERTY = ../libiberty/libiberty.a
- # Header files.
- HFILES = \
- cgen-ops.h cgen-types.h \
-+ avr32-asm.h avr32-opc.h \
- fr30-desc.h fr30-opc.h \
- frv-desc.h frv-opc.h \
- h8500-opc.h \
-@@ -63,6 +64,9 @@ CFILES = \
- arc-ext.c \
- arm-dis.c \
- avr-dis.c \
-+ avr32-asm.c \
-+ avr32-dis.c \
-+ avr32-opc.c \
- bfin-dis.c \
- cgen-asm.c \
- cgen-bitset.c \
-@@ -217,6 +221,9 @@ ALL_MACHINES = \
- arc-ext.lo \
- arm-dis.lo \
- avr-dis.lo \
-+ avr32-asm.lo \
-+ avr32-dis.lo \
-+ avr32-opc.lo \
- bfin-dis.lo \
- cgen-asm.lo \
- cgen-bitset.lo \
-@@ -674,6 +681,15 @@ avr-dis.lo: avr-dis.c sysdep.h config.h
- $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- opintl.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
- $(INCDIR)/opcode/avr.h
-+avr32-asm.lo: avr32-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(BFD_H) $(INCDIR)/symcat.h avr32-opc.h opintl.h \
-+ $(INCDIR)/xregex.h $(INCDIR)/xregex2.h \
-+ $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-+avr32-dis.lo: avr32-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
-+ avr32-opc.h opintl.h
-+avr32-opc.lo: avr32-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(BFD_H) $(INCDIR)/symcat.h avr32-opc.h $(INCDIR)/libiberty.h
- bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
- $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
- cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -2017,6 +2017,11 @@ enum bfd_architecture
- #define bfd_mach_avr4 4
- #define bfd_mach_avr5 5
- #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
- bfd_arch_bfin, /* ADI Blackfin */
- #define bfd_mach_bfin 1
- bfd_arch_cr16, /* National Semiconductor CompactRISC (ie CR16). */
-@@ -3758,6 +3763,88 @@ instructions */
- instructions */
- BFD_RELOC_AVR_6_ADIW,
-
-+/* 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,
-
---- /dev/null
-+++ b/bfd/bfd-in3.h
-@@ -0,0 +1,5406 @@
-+/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
-+ generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c",
-+ "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c",
-+ "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c",
-+ "linker.c" and "simple.c".
-+ Run "make headers" in your build bfd/ to regenerate. */
-+
-+/* Main header file for the bfd library -- portable access to object files.
-+
-+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+ Free Software Foundation, Inc.
-+
-+ Contributed by Cygnus Support.
-+
-+ 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 3 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. */
-+
-+#ifndef __BFD_H_SEEN__
-+#define __BFD_H_SEEN__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "ansidecl.h"
-+#include "symcat.h"
-+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-+#ifndef SABER
-+/* This hack is to avoid a problem with some strict ANSI C preprocessors.
-+ The problem is, "32_" is not a valid preprocessing token, and we don't
-+ want extra underscores (e.g., "nlm_32_"). The XCONCAT2 macro will
-+ cause the inner CONCAT2 macros to be evaluated first, producing
-+ still-valid pp-tokens. Then the final concatenation can be done. */
-+#undef CONCAT4
-+#define CONCAT4(a,b,c,d) XCONCAT2(CONCAT2(a,b),CONCAT2(c,d))
-+#endif
-+#endif
-+
-+/* This is a utility macro to handle the situation where the code
-+ wants to place a constant string into the code, followed by a
-+ comma and then the length of the string. Doing this by hand
-+ is error prone, so using this macro is safer. The macro will
-+ also safely handle the case where a NULL is passed as the arg. */
-+#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0)
-+/* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
-+ to create the arguments to another macro, since the preprocessor
-+ will mis-count the number of arguments to the outer macro (by not
-+ evaluating STRING_COMMA_LEN and so missing the comma). This is a
-+ problem for example when trying to use STRING_COMMA_LEN to build
-+ the arguments to the strncmp() macro. Hence this alternative
-+ definition of strncmp is provided here.
-+
-+ Note - these macros do NOT work if STR2 is not a constant string. */
-+#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
-+ /* strcpy() can have a similar problem, but since we know we are
-+ copying a constant string, we can use memcpy which will be faster
-+ since there is no need to check for a NUL byte inside STR. We
-+ can also save time if we do not need to copy the terminating NUL. */
-+#define LITMEMCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2) - 1)
-+#define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
-+
-+
-+/* The word size used by BFD on the host. This may be 64 with a 32
-+ bit target if the host is 64 bit, or if other 64 bit targets have
-+ been selected with --enable-targets, or if --enable-64-bit-bfd. */
-+#define BFD_ARCH_SIZE 32
-+
-+/* The word size of the default bfd target. */
-+#define BFD_DEFAULT_TARGET_SIZE 32
-+
-+#define BFD_HOST_64BIT_LONG 0
-+#define BFD_HOST_64BIT_LONG_LONG 0
-+#define BFD_HOST_LONG_LONG 1
-+#if 1
-+#define BFD_HOST_64_BIT long long
-+#define BFD_HOST_U_64_BIT unsigned long long
-+typedef BFD_HOST_64_BIT bfd_int64_t;
-+typedef BFD_HOST_U_64_BIT bfd_uint64_t;
-+#endif
-+
-+#if BFD_ARCH_SIZE >= 64
-+#define BFD64
-+#endif
-+
-+#ifndef INLINE
-+#if __GNUC__ >= 2
-+#define INLINE __inline__
-+#else
-+#define INLINE
-+#endif
-+#endif
-+
-+/* Declaring a type wide enough to hold a host long and a host pointer. */
-+#define BFD_HOSTPTR_T unsigned long
-+typedef BFD_HOSTPTR_T bfd_hostptr_t;
-+
-+/* Forward declaration. */
-+typedef struct bfd bfd;
-+
-+/* Boolean type used in bfd. Too many systems define their own
-+ versions of "boolean" for us to safely typedef a "boolean" of
-+ our own. Using an enum for "bfd_boolean" has its own set of
-+ problems, with strange looking casts required to avoid warnings
-+ on some older compilers. Thus we just use an int.
-+
-+ General rule: Functions which are bfd_boolean return TRUE on
-+ success and FALSE on failure (unless they're a predicate). */
-+
-+typedef int bfd_boolean;
-+#undef FALSE
-+#undef TRUE
-+#define FALSE 0
-+#define TRUE 1
-+
-+#ifdef BFD64
-+
-+#ifndef BFD_HOST_64_BIT
-+ #error No 64 bit integer type available
-+#endif /* ! defined (BFD_HOST_64_BIT) */
-+
-+typedef BFD_HOST_U_64_BIT bfd_vma;
-+typedef BFD_HOST_64_BIT bfd_signed_vma;
-+typedef BFD_HOST_U_64_BIT bfd_size_type;
-+typedef BFD_HOST_U_64_BIT symvalue;
-+
-+#ifndef fprintf_vma
-+#if BFD_HOST_64BIT_LONG
-+#define sprintf_vma(s,x) sprintf (s, "%016lx", x)
-+#define fprintf_vma(f,x) fprintf (f, "%016lx", x)
-+#elif BFD_HOST_64BIT_LONG_LONG
-+#define sprintf_vma(s,x) sprintf (s, "%016llx", x)
-+#define fprintf_vma(f,x) fprintf (f, "%016llx", x)
-+#else
-+#define _bfd_int64_low(x) ((unsigned long) (((x) & 0xffffffff)))
-+#define _bfd_int64_high(x) ((unsigned long) (((x) >> 32) & 0xffffffff))
-+#define fprintf_vma(s,x) \
-+ fprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-+#define sprintf_vma(s,x) \
-+ sprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-+#endif
-+#endif
-+
-+#else /* not BFD64 */
-+
-+/* Represent a target address. Also used as a generic unsigned type
-+ which is guaranteed to be big enough to hold any arithmetic types
-+ we need to deal with. */
-+typedef unsigned long bfd_vma;
-+
-+/* A generic signed type which is guaranteed to be big enough to hold any
-+ arithmetic types we need to deal with. Can be assumed to be compatible
-+ with bfd_vma in the same way that signed and unsigned ints are compatible
-+ (as parameters, in assignment, etc). */
-+typedef long bfd_signed_vma;
-+
-+typedef unsigned long symvalue;
-+typedef unsigned long bfd_size_type;
-+
-+/* Print a bfd_vma x on stream s. */
-+#define fprintf_vma(s,x) fprintf (s, "%08lx", x)
-+#define sprintf_vma(s,x) sprintf (s, "%08lx", x)
-+
-+#endif /* not BFD64 */
-+
-+#define HALF_BFD_SIZE_TYPE \
-+ (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2))
-+
-+#ifndef BFD_HOST_64_BIT
-+/* Fall back on a 32 bit type. The idea is to make these types always
-+ available for function return types, but in the case that
-+ BFD_HOST_64_BIT is undefined such a function should abort or
-+ otherwise signal an error. */
-+typedef bfd_signed_vma bfd_int64_t;
-+typedef bfd_vma bfd_uint64_t;
-+#endif
-+
-+/* An offset into a file. BFD always uses the largest possible offset
-+ based on the build time availability of fseek, fseeko, or fseeko64. */
-+typedef BFD_HOST_64_BIT file_ptr;
-+typedef unsigned BFD_HOST_64_BIT ufile_ptr;
-+
-+extern void bfd_sprintf_vma (bfd *, char *, bfd_vma);
-+extern void bfd_fprintf_vma (bfd *, void *, bfd_vma);
-+
-+#define printf_vma(x) fprintf_vma(stdout,x)
-+#define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
-+
-+typedef unsigned int flagword; /* 32 bits of flags */
-+typedef unsigned char bfd_byte;
-+
-+/* File formats. */
-+
-+typedef enum bfd_format
-+{
-+ bfd_unknown = 0, /* File format is unknown. */
-+ bfd_object, /* Linker/assembler/compiler output. */
-+ bfd_archive, /* Object archive file. */
-+ bfd_core, /* Core dump. */
-+ bfd_type_end /* Marks the end; don't use it! */
-+}
-+bfd_format;
-+
-+/* Values that may appear in the flags field of a BFD. These also
-+ appear in the object_flags field of the bfd_target structure, where
-+ they indicate the set of flags used by that backend (not all flags
-+ are meaningful for all object file formats) (FIXME: at the moment,
-+ the object_flags values have mostly just been copied from backend
-+ to another, and are not necessarily correct). */
-+
-+/* No flags. */
-+#define BFD_NO_FLAGS 0x00
-+
-+/* BFD contains relocation entries. */
-+#define HAS_RELOC 0x01
-+
-+/* BFD is directly executable. */
-+#define EXEC_P 0x02
-+
-+/* BFD has line number information (basically used for F_LNNO in a
-+ COFF header). */
-+#define HAS_LINENO 0x04
-+
-+/* BFD has debugging information. */
-+#define HAS_DEBUG 0x08
-+
-+/* BFD has symbols. */
-+#define HAS_SYMS 0x10
-+
-+/* BFD has local symbols (basically used for F_LSYMS in a COFF
-+ header). */
-+#define HAS_LOCALS 0x20
-+
-+/* BFD is a dynamic object. */
-+#define DYNAMIC 0x40
-+
-+/* Text section is write protected (if D_PAGED is not set, this is
-+ like an a.out NMAGIC file) (the linker sets this by default, but
-+ clears it for -r or -N). */
-+#define WP_TEXT 0x80
-+
-+/* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
-+ linker sets this by default, but clears it for -r or -n or -N). */
-+#define D_PAGED 0x100
-+
-+/* BFD is relaxable (this means that bfd_relax_section may be able to
-+ do something) (sometimes bfd_relax_section can do something even if
-+ this is not set). */
-+#define BFD_IS_RELAXABLE 0x200
-+
-+/* This may be set before writing out a BFD to request using a
-+ traditional format. For example, this is used to request that when
-+ writing out an a.out object the symbols not be hashed to eliminate
-+ duplicates. */
-+#define BFD_TRADITIONAL_FORMAT 0x400
-+
-+/* This flag indicates that the BFD contents are actually cached in
-+ memory. If this is set, iostream points to a bfd_in_memory struct. */
-+#define BFD_IN_MEMORY 0x800
-+
-+/* The sections in this BFD specify a memory page. */
-+#define HAS_LOAD_PAGE 0x1000
-+
-+/* This BFD has been created by the linker and doesn't correspond
-+ to any input file. */
-+#define BFD_LINKER_CREATED 0x2000
-+
-+/* Symbols and relocation. */
-+
-+/* A count of carsyms (canonical archive symbols). */
-+typedef unsigned long symindex;
-+
-+/* How to perform a relocation. */
-+typedef const struct reloc_howto_struct reloc_howto_type;
-+
-+#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
-+
-+/* General purpose part of a symbol X;
-+ target specific parts are in libcoff.h, libaout.h, etc. */
-+
-+#define bfd_get_section(x) ((x)->section)
-+#define bfd_get_output_section(x) ((x)->section->output_section)
-+#define bfd_set_section(x,y) ((x)->section) = (y)
-+#define bfd_asymbol_base(x) ((x)->section->vma)
-+#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
-+#define bfd_asymbol_name(x) ((x)->name)
-+/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
-+#define bfd_asymbol_bfd(x) ((x)->the_bfd)
-+#define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
-+
-+/* A canonical archive symbol. */
-+/* This is a type pun with struct ranlib on purpose! */
-+typedef struct carsym
-+{
-+ char *name;
-+ file_ptr file_offset; /* Look here to find the file. */
-+}
-+carsym; /* To make these you call a carsymogen. */
-+
-+/* Used in generating armaps (archive tables of contents).
-+ Perhaps just a forward definition would do? */
-+struct orl /* Output ranlib. */
-+{
-+ char **name; /* Symbol name. */
-+ union
-+ {
-+ file_ptr pos;
-+ bfd *abfd;
-+ } u; /* bfd* or file position. */
-+ int namidx; /* Index into string table. */
-+};
-+
-+/* Linenumber stuff. */
-+typedef struct lineno_cache_entry
-+{
-+ unsigned int line_number; /* Linenumber from start of function. */
-+ union
-+ {
-+ struct bfd_symbol *sym; /* Function name. */
-+ bfd_vma offset; /* Offset into section. */
-+ } u;
-+}
-+alent;
-+
-+/* Object and core file sections. */
-+
-+#define align_power(addr, align) \
-+ (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
-+
-+typedef struct bfd_section *sec_ptr;
-+
-+#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
-+#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
-+#define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
-+#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
-+#define bfd_section_name(bfd, ptr) ((ptr)->name)
-+#define bfd_section_size(bfd, ptr) ((ptr)->size)
-+#define bfd_get_section_size(ptr) ((ptr)->size)
-+#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
-+#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
-+#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
-+#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
-+#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
-+
-+#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
-+
-+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
-+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
-+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
-+/* Find the address one past the end of SEC. */
-+#define bfd_get_section_limit(bfd, sec) \
-+ (((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
-+ / bfd_octets_per_byte (bfd))
-+
-+/* Return TRUE if section has been discarded. */
-+#define elf_discarded_section(sec) \
-+ (!bfd_is_abs_section (sec) \
-+ && bfd_is_abs_section ((sec)->output_section) \
-+ && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \
-+ && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
-+
-+/* Forward define. */
-+struct stat;
-+
-+typedef enum bfd_print_symbol
-+{
-+ bfd_print_symbol_name,
-+ bfd_print_symbol_more,
-+ bfd_print_symbol_all
-+} bfd_print_symbol_type;
-+
-+/* Information about a symbol that nm needs. */
-+
-+typedef struct _symbol_info
-+{
-+ symvalue value;
-+ char type;
-+ const char *name; /* Symbol name. */
-+ unsigned char stab_type; /* Stab type. */
-+ char stab_other; /* Stab other. */
-+ short stab_desc; /* Stab desc. */
-+ const char *stab_name; /* String for stab type. */
-+} symbol_info;
-+
-+/* Get the name of a stabs type code. */
-+
-+extern const char *bfd_get_stab_name (int);
-+
-+/* Hash table routines. There is no way to free up a hash table. */
-+
-+/* An element in the hash table. Most uses will actually use a larger
-+ structure, and an instance of this will be the first field. */
-+
-+struct bfd_hash_entry
-+{
-+ /* Next entry for this hash code. */
-+ struct bfd_hash_entry *next;
-+ /* String being hashed. */
-+ const char *string;
-+ /* Hash code. This is the full hash code, not the index into the
-+ table. */
-+ unsigned long hash;
-+};
-+
-+/* A hash table. */
-+
-+struct bfd_hash_table
-+{
-+ /* The hash array. */
-+ struct bfd_hash_entry **table;
-+ /* A function used to create new elements in the hash table. The
-+ first entry is itself a pointer to an element. When this
-+ function is first invoked, this pointer will be NULL. However,
-+ having the pointer permits a hierarchy of method functions to be
-+ built each of which calls the function in the superclass. Thus
-+ each function should be written to allocate a new block of memory
-+ only if the argument is NULL. */
-+ struct bfd_hash_entry *(*newfunc)
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+ /* An objalloc for this hash table. This is a struct objalloc *,
-+ but we use void * to avoid requiring the inclusion of objalloc.h. */
-+ void *memory;
-+ /* The number of slots in the hash table. */
-+ unsigned int size;
-+ /* The number of entries in the hash table. */
-+ unsigned int count;
-+ /* The size of elements. */
-+ unsigned int entsize;
-+ /* If non-zero, don't grow the hash table. */
-+ unsigned int frozen:1;
-+};
-+
-+/* Initialize a hash table. */
-+extern bfd_boolean bfd_hash_table_init
-+ (struct bfd_hash_table *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int);
-+
-+/* Initialize a hash table specifying a size. */
-+extern bfd_boolean bfd_hash_table_init_n
-+ (struct bfd_hash_table *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int, unsigned int);
-+
-+/* Free up a hash table. */
-+extern void bfd_hash_table_free
-+ (struct bfd_hash_table *);
-+
-+/* Look up a string in a hash table. If CREATE is TRUE, a new entry
-+ will be created for this string if one does not already exist. The
-+ COPY argument must be TRUE if this routine should copy the string
-+ into newly allocated memory when adding an entry. */
-+extern struct bfd_hash_entry *bfd_hash_lookup
-+ (struct bfd_hash_table *, const char *, bfd_boolean create,
-+ bfd_boolean copy);
-+
-+/* Replace an entry in a hash table. */
-+extern void bfd_hash_replace
-+ (struct bfd_hash_table *, struct bfd_hash_entry *old,
-+ struct bfd_hash_entry *nw);
-+
-+/* Base method for creating a hash table entry. */
-+extern struct bfd_hash_entry *bfd_hash_newfunc
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+
-+/* Grab some space for a hash table entry. */
-+extern void *bfd_hash_allocate
-+ (struct bfd_hash_table *, unsigned int);
-+
-+/* Traverse a hash table in a random order, calling a function on each
-+ element. If the function returns FALSE, the traversal stops. The
-+ INFO argument is passed to the function. */
-+extern void bfd_hash_traverse
-+ (struct bfd_hash_table *,
-+ bfd_boolean (*) (struct bfd_hash_entry *, void *),
-+ void *info);
-+
-+/* Allows the default size of a hash table to be configured. New hash
-+ tables allocated using bfd_hash_table_init will be created with
-+ this size. */
-+extern void bfd_hash_set_default_size (bfd_size_type);
-+
-+/* This structure is used to keep track of stabs in sections
-+ information while linking. */
-+
-+struct stab_info
-+{
-+ /* A hash table used to hold stabs strings. */
-+ struct bfd_strtab_hash *strings;
-+ /* The header file hash table. */
-+ struct bfd_hash_table includes;
-+ /* The first .stabstr section. */
-+ struct bfd_section *stabstr;
-+};
-+
-+#define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table
-+
-+/* User program access to BFD facilities. */
-+
-+/* Direct I/O routines, for programs which know more about the object
-+ file than BFD does. Use higher level routines if possible. */
-+
-+extern bfd_size_type bfd_bread (void *, bfd_size_type, bfd *);
-+extern bfd_size_type bfd_bwrite (const void *, bfd_size_type, bfd *);
-+extern int bfd_seek (bfd *, file_ptr, int);
-+extern file_ptr bfd_tell (bfd *);
-+extern int bfd_flush (bfd *);
-+extern int bfd_stat (bfd *, struct stat *);
-+
-+/* Deprecated old routines. */
-+#if __GNUC__
-+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
-+ bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
-+ bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#else
-+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
-+ bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
-+ bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#endif
-+extern void warn_deprecated (const char *, const char *, int, const char *);
-+
-+/* Cast from const char * to char * so that caller can assign to
-+ a char * without a warning. */
-+#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
-+#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
-+#define bfd_get_format(abfd) ((abfd)->format)
-+#define bfd_get_target(abfd) ((abfd)->xvec->name)
-+#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
-+#define bfd_family_coff(abfd) \
-+ (bfd_get_flavour (abfd) == bfd_target_coff_flavour || \
-+ bfd_get_flavour (abfd) == bfd_target_xcoff_flavour)
-+#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
-+#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
-+#define bfd_header_big_endian(abfd) \
-+ ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
-+#define bfd_header_little_endian(abfd) \
-+ ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
-+#define bfd_get_file_flags(abfd) ((abfd)->flags)
-+#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
-+#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-+#define bfd_my_archive(abfd) ((abfd)->my_archive)
-+#define bfd_has_map(abfd) ((abfd)->has_armap)
-+
-+#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
-+#define bfd_usrdata(abfd) ((abfd)->usrdata)
-+
-+#define bfd_get_start_address(abfd) ((abfd)->start_address)
-+#define bfd_get_symcount(abfd) ((abfd)->symcount)
-+#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
-+#define bfd_count_sections(abfd) ((abfd)->section_count)
-+
-+#define bfd_get_dynamic_symcount(abfd) ((abfd)->dynsymcount)
-+
-+#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
-+
-+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
-+
-+extern bfd_boolean bfd_cache_close
-+ (bfd *abfd);
-+/* NB: This declaration should match the autogenerated one in libbfd.h. */
-+
-+extern bfd_boolean bfd_cache_close_all (void);
-+
-+extern bfd_boolean bfd_record_phdr
-+ (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
-+ bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **);
-+
-+/* Byte swapping routines. */
-+
-+bfd_uint64_t bfd_getb64 (const void *);
-+bfd_uint64_t bfd_getl64 (const void *);
-+bfd_int64_t bfd_getb_signed_64 (const void *);
-+bfd_int64_t bfd_getl_signed_64 (const void *);
-+bfd_vma bfd_getb32 (const void *);
-+bfd_vma bfd_getl32 (const void *);
-+bfd_signed_vma bfd_getb_signed_32 (const void *);
-+bfd_signed_vma bfd_getl_signed_32 (const void *);
-+bfd_vma bfd_getb16 (const void *);
-+bfd_vma bfd_getl16 (const void *);
-+bfd_signed_vma bfd_getb_signed_16 (const void *);
-+bfd_signed_vma bfd_getl_signed_16 (const void *);
-+void bfd_putb64 (bfd_uint64_t, void *);
-+void bfd_putl64 (bfd_uint64_t, void *);
-+void bfd_putb32 (bfd_vma, void *);
-+void bfd_putl32 (bfd_vma, void *);
-+void bfd_putb16 (bfd_vma, void *);
-+void bfd_putl16 (bfd_vma, void *);
-+
-+/* Byte swapping routines which take size and endiannes as arguments. */
-+
-+bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean);
-+void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean);
-+
-+extern bfd_boolean bfd_section_already_linked_table_init (void);
-+extern void bfd_section_already_linked_table_free (void);
-+
-+/* Externally visible ECOFF routines. */
-+
-+#if defined(__STDC__) || defined(ALMOST_STDC)
-+struct ecoff_debug_info;
-+struct ecoff_debug_swap;
-+struct ecoff_extr;
-+struct bfd_symbol;
-+struct bfd_link_info;
-+struct bfd_link_hash_entry;
-+struct bfd_elf_version_tree;
-+#endif
-+extern bfd_vma bfd_ecoff_get_gp_value
-+ (bfd * abfd);
-+extern bfd_boolean bfd_ecoff_set_gp_value
-+ (bfd *abfd, bfd_vma gp_value);
-+extern bfd_boolean bfd_ecoff_set_regmasks
-+ (bfd *abfd, unsigned long gprmask, unsigned long fprmask,
-+ unsigned long *cprmask);
-+extern void *bfd_ecoff_debug_init
-+ (bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
-+extern void bfd_ecoff_debug_free
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_accumulate
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-+ struct ecoff_debug_info *input_debug,
-+ const struct ecoff_debug_swap *input_swap, struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_accumulate_other
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-+ struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_externals
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, bfd_boolean relocatable,
-+ bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *),
-+ void (*set_index) (struct bfd_symbol *, bfd_size_type));
-+extern bfd_boolean bfd_ecoff_debug_one_external
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, const char *name,
-+ struct ecoff_extr *esym);
-+extern bfd_size_type bfd_ecoff_debug_size
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap);
-+extern bfd_boolean bfd_ecoff_write_debug
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, file_ptr where);
-+extern bfd_boolean bfd_ecoff_write_accumulated_debug
-+ (void *handle, bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap,
-+ struct bfd_link_info *info, file_ptr where);
-+
-+/* Externally visible ELF routines. */
-+
-+struct bfd_link_needed_list
-+{
-+ struct bfd_link_needed_list *next;
-+ bfd *by;
-+ const char *name;
-+};
-+
-+enum dynamic_lib_link_class {
-+ DYN_NORMAL = 0,
-+ DYN_AS_NEEDED = 1,
-+ DYN_DT_NEEDED = 2,
-+ DYN_NO_ADD_NEEDED = 4,
-+ DYN_NO_NEEDED = 8
-+};
-+
-+enum notice_asneeded_action {
-+ notice_as_needed,
-+ notice_not_needed,
-+ notice_needed
-+};
-+
-+extern bfd_boolean bfd_elf_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
-+ bfd_boolean);
-+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_elf_get_bfd_needed_list
-+ (bfd *, struct bfd_link_needed_list **);
-+extern bfd_boolean bfd_elf_size_dynamic_sections
-+ (bfd *, const char *, const char *, const char *, const char * const *,
-+ struct bfd_link_info *, struct bfd_section **,
-+ struct bfd_elf_version_tree *);
-+extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr
-+ (bfd *, struct bfd_link_info *);
-+extern void bfd_elf_set_dt_needed_name
-+ (bfd *, const char *);
-+extern const char *bfd_elf_get_dt_soname
-+ (bfd *);
-+extern void bfd_elf_set_dyn_lib_class
-+ (bfd *, enum dynamic_lib_link_class);
-+extern int bfd_elf_get_dyn_lib_class
-+ (bfd *);
-+extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_elf_discard_info
-+ (bfd *, struct bfd_link_info *);
-+extern unsigned int _bfd_elf_default_action_discarded
-+ (struct bfd_section *);
-+
-+/* Return an upper bound on the number of bytes required to store a
-+ copy of ABFD's program header table entries. Return -1 if an error
-+ occurs; bfd_get_error will return an appropriate code. */
-+extern long bfd_get_elf_phdr_upper_bound
-+ (bfd *abfd);
-+
-+/* Copy ABFD's program header table entries to *PHDRS. The entries
-+ will be stored as an array of Elf_Internal_Phdr structures, as
-+ defined in include/elf/internal.h. To find out how large the
-+ buffer needs to be, call bfd_get_elf_phdr_upper_bound.
-+
-+ Return the number of program header table entries read, or -1 if an
-+ error occurs; bfd_get_error will return an appropriate code. */
-+extern int bfd_get_elf_phdrs
-+ (bfd *abfd, void *phdrs);
-+
-+/* Create a new BFD as if by bfd_openr. Rather than opening a file,
-+ reconstruct an ELF file by reading the segments out of remote memory
-+ based on the ELF file header at EHDR_VMA and the ELF program headers it
-+ points to. If not null, *LOADBASEP is filled in with the difference
-+ between the VMAs from which the segments were read, and the VMAs the
-+ file headers (and hence BFD's idea of each section's VMA) put them at.
-+
-+ The function TARGET_READ_MEMORY is called to copy LEN bytes from the
-+ remote memory at target address VMA into the local buffer at MYADDR; it
-+ should return zero on success or an `errno' code on failure. TEMPL must
-+ be a BFD for an ELF target with the word size and byte order found in
-+ the remote memory. */
-+extern bfd *bfd_elf_bfd_from_remote_memory
-+ (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
-+ int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len));
-+
-+/* Return the arch_size field of an elf bfd, or -1 if not elf. */
-+extern int bfd_get_arch_size
-+ (bfd *);
-+
-+/* Return TRUE if address "naturally" sign extends, or -1 if not elf. */
-+extern int bfd_get_sign_extend_vma
-+ (bfd *);
-+
-+extern struct bfd_section *_bfd_elf_tls_setup
-+ (bfd *, struct bfd_link_info *);
-+
-+extern void _bfd_fix_excluded_sec_syms
-+ (bfd *, struct bfd_link_info *);
-+
-+extern unsigned bfd_m68k_mach_to_features (int);
-+
-+extern int bfd_m68k_features_to_mach (unsigned);
-+
-+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-+ char **);
-+
-+extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-+ char **);
-+
-+/* SunOS shared library support routines for the linker. */
-+
-+extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_sunos_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_sunos_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *, struct bfd_section **,
-+ struct bfd_section **, struct bfd_section **);
-+
-+/* Linux shared library support routines for the linker. */
-+
-+extern bfd_boolean bfd_i386linux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+
-+/* mmap hacks */
-+
-+struct _bfd_window_internal;
-+typedef struct _bfd_window_internal bfd_window_internal;
-+
-+typedef struct _bfd_window
-+{
-+ /* What the user asked for. */
-+ void *data;
-+ bfd_size_type size;
-+ /* The actual window used by BFD. Small user-requested read-only
-+ regions sharing a page may share a single window into the object
-+ file. Read-write versions shouldn't until I've fixed things to
-+ keep track of which portions have been claimed by the
-+ application; don't want to give the same region back when the
-+ application wants two writable copies! */
-+ struct _bfd_window_internal *i;
-+}
-+bfd_window;
-+
-+extern void bfd_init_window
-+ (bfd_window *);
-+extern void bfd_free_window
-+ (bfd_window *);
-+extern bfd_boolean bfd_get_file_window
-+ (bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean);
-+
-+/* XCOFF support routines for the linker. */
-+
-+extern bfd_boolean bfd_xcoff_link_record_set
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_size_type);
-+extern bfd_boolean bfd_xcoff_import_symbol
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_vma,
-+ const char *, const char *, const char *, unsigned int);
-+extern bfd_boolean bfd_xcoff_export_symbol
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
-+extern bfd_boolean bfd_xcoff_link_count_reloc
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_xcoff_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_xcoff_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *, const char *, const char *,
-+ unsigned long, unsigned long, unsigned long, bfd_boolean,
-+ int, bfd_boolean, bfd_boolean, struct bfd_section **, bfd_boolean);
-+extern bfd_boolean bfd_xcoff_link_generate_rtinit
-+ (bfd *, const char *, const char *, bfd_boolean);
-+
-+/* XCOFF support routines for ar. */
-+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
-+ (bfd *, char *);
-+
-+/* Externally visible COFF routines. */
-+
-+#if defined(__STDC__) || defined(ALMOST_STDC)
-+struct internal_syment;
-+union internal_auxent;
-+#endif
-+
-+extern bfd_boolean bfd_coff_get_syment
-+ (bfd *, struct bfd_symbol *, struct internal_syment *);
-+
-+extern bfd_boolean bfd_coff_get_auxent
-+ (bfd *, struct bfd_symbol *, int, union internal_auxent *);
-+
-+extern bfd_boolean bfd_coff_set_symbol_class
-+ (bfd *, struct bfd_symbol *, unsigned int);
-+
-+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **);
-+
-+/* ARM VFP11 erratum workaround support. */
-+typedef enum
-+{
-+ BFD_ARM_VFP11_FIX_DEFAULT,
-+ BFD_ARM_VFP11_FIX_NONE,
-+ BFD_ARM_VFP11_FIX_SCALAR,
-+ BFD_ARM_VFP11_FIX_VECTOR
-+} bfd_arm_vfp11_fix;
-+
-+extern void bfd_elf32_arm_init_maps
-+ (bfd *);
-+
-+extern void bfd_elf32_arm_set_vfp11_fix
-+ (bfd *, struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_vfp11_erratum_scan
-+ (bfd *, struct bfd_link_info *);
-+
-+extern void bfd_elf32_arm_vfp11_fix_veneer_locations
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_arm_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_arm_process_before_allocation
-+ (bfd *, struct bfd_link_info *, int);
-+
-+extern bfd_boolean bfd_arm_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+/* PE ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_arm_pe_process_before_allocation
-+ (bfd *, struct bfd_link_info *, int);
-+
-+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ELF ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_process_before_allocation
-+ (bfd *, struct bfd_link_info *);
-+
-+void bfd_elf32_arm_set_target_relocs
-+ (bfd *, struct bfd_link_info *, int, char *, int, int, bfd_arm_vfp11_fix,
-+ int, int);
-+
-+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ELF ARM mapping symbol support */
-+#define BFD_ARM_SPECIAL_SYM_TYPE_MAP (1 << 0)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_TAG (1 << 1)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER (1 << 2)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_ANY (~0)
-+extern bfd_boolean bfd_is_arm_special_symbol_name
-+ (const char * name, int type);
-+
-+extern void bfd_elf32_arm_set_byteswap_code (struct bfd_link_info *, int);
-+
-+/* ARM Note section processing. */
-+extern bfd_boolean bfd_arm_merge_machines
-+ (bfd *, bfd *);
-+
-+extern bfd_boolean bfd_arm_update_notes
-+ (bfd *, const char *);
-+
-+extern unsigned int bfd_arm_get_mach_from_notes
-+ (bfd *, const char *);
-+
-+/* TI COFF load page support. */
-+extern void bfd_ticoff_set_section_load_page
-+ (struct bfd_section *, int);
-+
-+extern int bfd_ticoff_get_section_load_page
-+ (struct bfd_section *);
-+
-+/* H8/300 functions. */
-+extern bfd_vma bfd_h8300_pad_address
-+ (bfd *, bfd_vma);
-+
-+/* IA64 Itanium code generation. Called from linker. */
-+extern void bfd_elf32_ia64_after_parse
-+ (int);
-+
-+extern void bfd_elf64_ia64_after_parse
-+ (int);
-+
-+/* This structure is used for a comdat section, as in PE. A comdat
-+ section is associated with a particular symbol. When the linker
-+ sees a comdat section, it keeps only one of the sections with a
-+ given name and associated with a given symbol. */
-+
-+struct coff_comdat_info
-+{
-+ /* The name of the symbol associated with a comdat section. */
-+ const char *name;
-+
-+ /* The local symbol table index of the symbol associated with a
-+ comdat section. This is only meaningful to the object file format
-+ specific code; it is not an index into the list returned by
-+ bfd_canonicalize_symtab. */
-+ long symbol;
-+};
-+
-+extern struct coff_comdat_info *bfd_coff_get_comdat_section
-+ (bfd *, struct bfd_section *);
-+
-+/* Extracted from init.c. */
-+void bfd_init (void);
-+
-+/* Extracted from opncls.c. */
-+bfd *bfd_fopen (const char *filename, const char *target,
-+ const char *mode, int fd);
-+
-+bfd *bfd_openr (const char *filename, const char *target);
-+
-+bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
-+
-+bfd *bfd_openstreamr (const char *, const char *, void *);
-+
-+bfd *bfd_openr_iovec (const char *filename, const char *target,
-+ void *(*open) (struct bfd *nbfd,
-+ void *open_closure),
-+ void *open_closure,
-+ file_ptr (*pread) (struct bfd *nbfd,
-+ void *stream,
-+ void *buf,
-+ file_ptr nbytes,
-+ file_ptr offset),
-+ int (*close) (struct bfd *nbfd,
-+ void *stream),
-+ int (*stat) (struct bfd *abfd,
-+ void *stream,
-+ struct stat *sb));
-+
-+bfd *bfd_openw (const char *filename, const char *target);
-+
-+bfd_boolean bfd_close (bfd *abfd);
-+
-+bfd_boolean bfd_close_all_done (bfd *);
-+
-+bfd *bfd_create (const char *filename, bfd *templ);
-+
-+bfd_boolean bfd_make_writable (bfd *abfd);
-+
-+bfd_boolean bfd_make_readable (bfd *abfd);
-+
-+unsigned long bfd_calc_gnu_debuglink_crc32
-+ (unsigned long crc, const unsigned char *buf, bfd_size_type len);
-+
-+char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir);
-+
-+struct bfd_section *bfd_create_gnu_debuglink_section
-+ (bfd *abfd, const char *filename);
-+
-+bfd_boolean bfd_fill_in_gnu_debuglink_section
-+ (bfd *abfd, struct bfd_section *sect, const char *filename);
-+
-+/* Extracted from libbfd.c. */
-+
-+/* Byte swapping macros for user section data. */
-+
-+#define bfd_put_8(abfd, val, ptr) \
-+ ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
-+#define bfd_put_signed_8 \
-+ bfd_put_8
-+#define bfd_get_8(abfd, ptr) \
-+ (*(unsigned char *) (ptr) & 0xff)
-+#define bfd_get_signed_8(abfd, ptr) \
-+ (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
-+
-+#define bfd_put_16(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
-+#define bfd_put_signed_16 \
-+ bfd_put_16
-+#define bfd_get_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx16, (ptr))
-+#define bfd_get_signed_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
-+
-+#define bfd_put_32(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
-+#define bfd_put_signed_32 \
-+ bfd_put_32
-+#define bfd_get_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx32, (ptr))
-+#define bfd_get_signed_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_32, (ptr))
-+
-+#define bfd_put_64(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx64, ((val), (ptr)))
-+#define bfd_put_signed_64 \
-+ bfd_put_64
-+#define bfd_get_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx64, (ptr))
-+#define bfd_get_signed_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
-+
-+#define bfd_get(bits, abfd, ptr) \
-+ ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr) \
-+ : (bits) == 16 ? bfd_get_16 (abfd, ptr) \
-+ : (bits) == 32 ? bfd_get_32 (abfd, ptr) \
-+ : (bits) == 64 ? bfd_get_64 (abfd, ptr) \
-+ : (abort (), (bfd_vma) - 1))
-+
-+#define bfd_put(bits, abfd, val, ptr) \
-+ ((bits) == 8 ? bfd_put_8 (abfd, val, ptr) \
-+ : (bits) == 16 ? bfd_put_16 (abfd, val, ptr) \
-+ : (bits) == 32 ? bfd_put_32 (abfd, val, ptr) \
-+ : (bits) == 64 ? bfd_put_64 (abfd, val, ptr) \
-+ : (abort (), (void) 0))
-+
-+
-+/* Byte swapping macros for file header data. */
-+
-+#define bfd_h_put_8(abfd, val, ptr) \
-+ bfd_put_8 (abfd, val, ptr)
-+#define bfd_h_put_signed_8(abfd, val, ptr) \
-+ bfd_put_8 (abfd, val, ptr)
-+#define bfd_h_get_8(abfd, ptr) \
-+ bfd_get_8 (abfd, ptr)
-+#define bfd_h_get_signed_8(abfd, ptr) \
-+ bfd_get_signed_8 (abfd, ptr)
-+
-+#define bfd_h_put_16(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx16, (val, ptr))
-+#define bfd_h_put_signed_16 \
-+ bfd_h_put_16
-+#define bfd_h_get_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx16, (ptr))
-+#define bfd_h_get_signed_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_16, (ptr))
-+
-+#define bfd_h_put_32(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx32, (val, ptr))
-+#define bfd_h_put_signed_32 \
-+ bfd_h_put_32
-+#define bfd_h_get_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx32, (ptr))
-+#define bfd_h_get_signed_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_32, (ptr))
-+
-+#define bfd_h_put_64(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx64, (val, ptr))
-+#define bfd_h_put_signed_64 \
-+ bfd_h_put_64
-+#define bfd_h_get_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx64, (ptr))
-+#define bfd_h_get_signed_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
-+
-+/* Aliases for the above, which should eventually go away. */
-+
-+#define H_PUT_64 bfd_h_put_64
-+#define H_PUT_32 bfd_h_put_32
-+#define H_PUT_16 bfd_h_put_16
-+#define H_PUT_8 bfd_h_put_8
-+#define H_PUT_S64 bfd_h_put_signed_64
-+#define H_PUT_S32 bfd_h_put_signed_32
-+#define H_PUT_S16 bfd_h_put_signed_16
-+#define H_PUT_S8 bfd_h_put_signed_8
-+#define H_GET_64 bfd_h_get_64
-+#define H_GET_32 bfd_h_get_32
-+#define H_GET_16 bfd_h_get_16
-+#define H_GET_8 bfd_h_get_8
-+#define H_GET_S64 bfd_h_get_signed_64
-+#define H_GET_S32 bfd_h_get_signed_32
-+#define H_GET_S16 bfd_h_get_signed_16
-+#define H_GET_S8 bfd_h_get_signed_8
-+
-+
-+/* Extracted from bfdio.c. */
-+long bfd_get_mtime (bfd *abfd);
-+
-+file_ptr bfd_get_size (bfd *abfd);
-+
-+/* Extracted from bfdwin.c. */
-+/* Extracted from section.c. */
-+typedef struct bfd_section
-+{
-+ /* The name of the section; the name isn't a copy, the pointer is
-+ the same as that passed to bfd_make_section. */
-+ const char *name;
-+
-+ /* A unique sequence number. */
-+ int id;
-+
-+ /* Which section in the bfd; 0..n-1 as sections are created in a bfd. */
-+ int index;
-+
-+ /* The next section in the list belonging to the BFD, or NULL. */
-+ struct bfd_section *next;
-+
-+ /* The previous section in the list belonging to the BFD, or NULL. */
-+ struct bfd_section *prev;
-+
-+ /* The field flags contains attributes of the section. Some
-+ flags are read in from the object file, and some are
-+ synthesized from other information. */
-+ flagword flags;
-+
-+#define SEC_NO_FLAGS 0x000
-+
-+ /* Tells the OS to allocate space for this section when loading.
-+ This is clear for a section containing debug information only. */
-+#define SEC_ALLOC 0x001
-+
-+ /* Tells the OS to load the section from the file when loading.
-+ This is clear for a .bss section. */
-+#define SEC_LOAD 0x002
-+
-+ /* The section contains data still to be relocated, so there is
-+ some relocation information too. */
-+#define SEC_RELOC 0x004
-+
-+ /* A signal to the OS that the section contains read only data. */
-+#define SEC_READONLY 0x008
-+
-+ /* The section contains code only. */
-+#define SEC_CODE 0x010
-+
-+ /* The section contains data only. */
-+#define SEC_DATA 0x020
-+
-+ /* The section will reside in ROM. */
-+#define SEC_ROM 0x040
-+
-+ /* The section contains constructor information. This section
-+ type is used by the linker to create lists of constructors and
-+ destructors used by <<g++>>. When a back end sees a symbol
-+ which should be used in a constructor list, it creates a new
-+ section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
-+ the symbol to it, and builds a relocation. To build the lists
-+ of constructors, all the linker has to do is catenate all the
-+ sections called <<__CTOR_LIST__>> and relocate the data
-+ contained within - exactly the operations it would peform on
-+ standard data. */
-+#define SEC_CONSTRUCTOR 0x080
-+
-+ /* The section has contents - a data section could be
-+ <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
-+ <<SEC_HAS_CONTENTS>> */
-+#define SEC_HAS_CONTENTS 0x100
-+
-+ /* An instruction to the linker to not output the section
-+ even if it has information which would normally be written. */
-+#define SEC_NEVER_LOAD 0x200
-+
-+ /* The section contains thread local data. */
-+#define SEC_THREAD_LOCAL 0x400
-+
-+ /* The section has GOT references. This flag is only for the
-+ linker, and is currently only used by the elf32-hppa back end.
-+ It will be set if global offset table references were detected
-+ in this section, which indicate to the linker that the section
-+ contains PIC code, and must be handled specially when doing a
-+ static link. */
-+#define SEC_HAS_GOT_REF 0x800
-+
-+ /* The section contains common symbols (symbols may be defined
-+ multiple times, the value of a symbol is the amount of
-+ space it requires, and the largest symbol value is the one
-+ used). Most targets have exactly one of these (which we
-+ translate to bfd_com_section_ptr), but ECOFF has two. */
-+#define SEC_IS_COMMON 0x1000
-+
-+ /* The section contains only debugging information. For
-+ example, this is set for ELF .debug and .stab sections.
-+ strip tests this flag to see if a section can be
-+ discarded. */
-+#define SEC_DEBUGGING 0x2000
-+
-+ /* The contents of this section are held in memory pointed to
-+ by the contents field. This is checked by bfd_get_section_contents,
-+ and the data is retrieved from memory if appropriate. */
-+#define SEC_IN_MEMORY 0x4000
-+
-+ /* The contents of this section are to be excluded by the
-+ linker for executable and shared objects unless those
-+ objects are to be further relocated. */
-+#define SEC_EXCLUDE 0x8000
-+
-+ /* The contents of this section are to be sorted based on the sum of
-+ the symbol and addend values specified by the associated relocation
-+ entries. Entries without associated relocation entries will be
-+ appended to the end of the section in an unspecified order. */
-+#define SEC_SORT_ENTRIES 0x10000
-+
-+ /* When linking, duplicate sections of the same name should be
-+ discarded, rather than being combined into a single section as
-+ is usually done. This is similar to how common symbols are
-+ handled. See SEC_LINK_DUPLICATES below. */
-+#define SEC_LINK_ONCE 0x20000
-+
-+ /* If SEC_LINK_ONCE is set, this bitfield describes how the linker
-+ should handle duplicate sections. */
-+#define SEC_LINK_DUPLICATES 0x40000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that duplicate
-+ sections with the same name should simply be discarded. */
-+#define SEC_LINK_DUPLICATES_DISCARD 0x0
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if there are any duplicate sections, although
-+ it should still only link one copy. */
-+#define SEC_LINK_DUPLICATES_ONE_ONLY 0x80000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if any duplicate sections are a different size. */
-+#define SEC_LINK_DUPLICATES_SAME_SIZE 0x100000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if any duplicate sections contain different
-+ contents. */
-+#define SEC_LINK_DUPLICATES_SAME_CONTENTS \
-+ (SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE)
-+
-+ /* This section was created by the linker as part of dynamic
-+ relocation or other arcane processing. It is skipped when
-+ going through the first-pass output, trusting that someone
-+ else up the line will take care of it later. */
-+#define SEC_LINKER_CREATED 0x200000
-+
-+ /* This section should not be subject to garbage collection.
-+ Also set to inform the linker that this section should not be
-+ listed in the link map as discarded. */
-+#define SEC_KEEP 0x400000
-+
-+ /* This section contains "short" data, and should be placed
-+ "near" the GP. */
-+#define SEC_SMALL_DATA 0x800000
-+
-+ /* Attempt to merge identical entities in the section.
-+ Entity size is given in the entsize field. */
-+#define SEC_MERGE 0x1000000
-+
-+ /* If given with SEC_MERGE, entities to merge are zero terminated
-+ strings where entsize specifies character size instead of fixed
-+ size entries. */
-+#define SEC_STRINGS 0x2000000
-+
-+ /* This section contains data about section groups. */
-+#define SEC_GROUP 0x4000000
-+
-+ /* The section is a COFF shared library section. This flag is
-+ only for the linker. If this type of section appears in
-+ the input file, the linker must copy it to the output file
-+ without changing the vma or size. FIXME: Although this
-+ was originally intended to be general, it really is COFF
-+ specific (and the flag was renamed to indicate this). It
-+ might be cleaner to have some more general mechanism to
-+ allow the back end to control what the linker does with
-+ sections. */
-+#define SEC_COFF_SHARED_LIBRARY 0x10000000
-+
-+ /* This section contains data which may be shared with other
-+ executables or shared objects. This is for COFF only. */
-+#define SEC_COFF_SHARED 0x20000000
-+
-+ /* When a section with this flag is being linked, then if the size of
-+ the input section is less than a page, it should not cross a page
-+ boundary. If the size of the input section is one page or more,
-+ it should be aligned on a page boundary. This is for TI
-+ TMS320C54X only. */
-+#define SEC_TIC54X_BLOCK 0x40000000
-+
-+ /* Conditionally link this section; do not link if there are no
-+ references found to any symbol in the section. This is for TI
-+ TMS320C54X only. */
-+#define SEC_TIC54X_CLINK 0x80000000
-+
-+ /* End of section flags. */
-+
-+ /* Some internal packed boolean fields. */
-+
-+ /* See the vma field. */
-+ unsigned int user_set_vma : 1;
-+
-+ /* A mark flag used by some of the linker backends. */
-+ unsigned int linker_mark : 1;
-+
-+ /* Another mark flag used by some of the linker backends. Set for
-+ output sections that have an input section. */
-+ unsigned int linker_has_input : 1;
-+
-+ /* Mark flags used by some linker backends for garbage collection. */
-+ unsigned int gc_mark : 1;
-+ unsigned int gc_mark_from_eh : 1;
-+
-+ /* The following flags are used by the ELF linker. */
-+
-+ /* Mark sections which have been allocated to segments. */
-+ unsigned int segment_mark : 1;
-+
-+ /* Type of sec_info information. */
-+ unsigned int sec_info_type:3;
-+#define ELF_INFO_TYPE_NONE 0
-+#define ELF_INFO_TYPE_STABS 1
-+#define ELF_INFO_TYPE_MERGE 2
-+#define ELF_INFO_TYPE_EH_FRAME 3
-+#define ELF_INFO_TYPE_JUST_SYMS 4
-+
-+ /* Nonzero if this section uses RELA relocations, rather than REL. */
-+ unsigned int use_rela_p:1;
-+
-+ /* Bits used by various backends. The generic code doesn't touch
-+ these fields. */
-+
-+ /* Nonzero if this section has TLS related relocations. */
-+ unsigned int has_tls_reloc:1;
-+
-+ /* Nonzero if this section has a gp reloc. */
-+ unsigned int has_gp_reloc:1;
-+
-+ /* Nonzero if this section needs the relax finalize pass. */
-+ unsigned int need_finalize_relax:1;
-+
-+ /* Whether relocations have been processed. */
-+ unsigned int reloc_done : 1;
-+
-+ /* End of internal packed boolean fields. */
-+
-+ /* The virtual memory address of the section - where it will be
-+ at run time. The symbols are relocated against this. The
-+ user_set_vma flag is maintained by bfd; if it's not set, the
-+ backend can assign addresses (for example, in <<a.out>>, where
-+ the default address for <<.data>> is dependent on the specific
-+ target and various flags). */
-+ bfd_vma vma;
-+
-+ /* The load address of the section - where it would be in a
-+ rom image; really only used for writing section header
-+ information. */
-+ bfd_vma lma;
-+
-+ /* The size of the section in octets, as it will be output.
-+ Contains a value even if the section has no contents (e.g., the
-+ size of <<.bss>>). */
-+ bfd_size_type size;
-+
-+ /* For input sections, the original size on disk of the section, in
-+ octets. This field is used by the linker relaxation code. It is
-+ currently only set for sections where the linker relaxation scheme
-+ doesn't cache altered section and reloc contents (stabs, eh_frame,
-+ SEC_MERGE, some coff relaxing targets), and thus the original size
-+ needs to be kept to read the section multiple times.
-+ For output sections, rawsize holds the section size calculated on
-+ a previous linker relaxation pass. */
-+ bfd_size_type rawsize;
-+
-+ /* If this section is going to be output, then this value is the
-+ offset in *bytes* into the output section of the first byte in the
-+ input section (byte ==> smallest addressable unit on the
-+ target). In most cases, if this was going to start at the
-+ 100th octet (8-bit quantity) in the output section, this value
-+ would be 100. However, if the target byte size is 16 bits
-+ (bfd_octets_per_byte is "2"), this value would be 50. */
-+ bfd_vma output_offset;
-+
-+ /* The output section through which to map on output. */
-+ struct bfd_section *output_section;
-+
-+ /* The alignment requirement of the section, as an exponent of 2 -
-+ e.g., 3 aligns to 2^3 (or 8). */
-+ unsigned int alignment_power;
-+
-+ /* If an input section, a pointer to a vector of relocation
-+ records for the data in this section. */
-+ struct reloc_cache_entry *relocation;
-+
-+ /* If an output section, a pointer to a vector of pointers to
-+ relocation records for the data in this section. */
-+ struct reloc_cache_entry **orelocation;
-+
-+ /* The number of relocation records in one of the above. */
-+ unsigned reloc_count;
-+
-+ /* Information below is back end specific - and not always used
-+ or updated. */
-+
-+ /* File position of section data. */
-+ file_ptr filepos;
-+
-+ /* File position of relocation info. */
-+ file_ptr rel_filepos;
-+
-+ /* File position of line data. */
-+ file_ptr line_filepos;
-+
-+ /* Pointer to data for applications. */
-+ void *userdata;
-+
-+ /* If the SEC_IN_MEMORY flag is set, this points to the actual
-+ contents. */
-+ unsigned char *contents;
-+
-+ /* Attached line number information. */
-+ alent *lineno;
-+
-+ /* Number of line number records. */
-+ unsigned int lineno_count;
-+
-+ /* Entity size for merging purposes. */
-+ unsigned int entsize;
-+
-+ /* Points to the kept section if this section is a link-once section,
-+ and is discarded. */
-+ struct bfd_section *kept_section;
-+
-+ /* When a section is being output, this value changes as more
-+ linenumbers are written out. */
-+ file_ptr moving_line_filepos;
-+
-+ /* What the section number is in the target world. */
-+ int target_index;
-+
-+ void *used_by_bfd;
-+
-+ /* If this is a constructor section then here is a list of the
-+ relocations created to relocate items within it. */
-+ struct relent_chain *constructor_chain;
-+
-+ /* The BFD which owns the section. */
-+ bfd *owner;
-+
-+ /* A symbol which points at this section only. */
-+ struct bfd_symbol *symbol;
-+ struct bfd_symbol **symbol_ptr_ptr;
-+
-+ /* Early in the link process, map_head and map_tail are used to build
-+ a list of input sections attached to an output section. Later,
-+ output sections use these fields for a list of bfd_link_order
-+ structs. */
-+ union {
-+ struct bfd_link_order *link_order;
-+ struct bfd_section *s;
-+ } map_head, map_tail;
-+} asection;
-+
-+/* These sections are global, and are managed by BFD. The application
-+ and target back end are not permitted to change the values in
-+ these sections. New code should use the section_ptr macros rather
-+ than referring directly to the const sections. The const sections
-+ may eventually vanish. */
-+#define BFD_ABS_SECTION_NAME "*ABS*"
-+#define BFD_UND_SECTION_NAME "*UND*"
-+#define BFD_COM_SECTION_NAME "*COM*"
-+#define BFD_IND_SECTION_NAME "*IND*"
-+
-+/* The absolute section. */
-+extern asection bfd_abs_section;
-+#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
-+#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
-+/* Pointer to the undefined section. */
-+extern asection bfd_und_section;
-+#define bfd_und_section_ptr ((asection *) &bfd_und_section)
-+#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
-+/* Pointer to the common section. */
-+extern asection bfd_com_section;
-+#define bfd_com_section_ptr ((asection *) &bfd_com_section)
-+/* Pointer to the indirect section. */
-+extern asection bfd_ind_section;
-+#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
-+#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
-+
-+#define bfd_is_const_section(SEC) \
-+ ( ((SEC) == bfd_abs_section_ptr) \
-+ || ((SEC) == bfd_und_section_ptr) \
-+ || ((SEC) == bfd_com_section_ptr) \
-+ || ((SEC) == bfd_ind_section_ptr))
-+
-+/* Macros to handle insertion and deletion of a bfd's sections. These
-+ only handle the list pointers, ie. do not adjust section_count,
-+ target_index etc. */
-+#define bfd_section_list_remove(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ asection *_next = _s->next; \
-+ asection *_prev = _s->prev; \
-+ if (_prev) \
-+ _prev->next = _next; \
-+ else \
-+ (ABFD)->sections = _next; \
-+ if (_next) \
-+ _next->prev = _prev; \
-+ else \
-+ (ABFD)->section_last = _prev; \
-+ } \
-+ while (0)
-+#define bfd_section_list_append(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ bfd *_abfd = ABFD; \
-+ _s->next = NULL; \
-+ if (_abfd->section_last) \
-+ { \
-+ _s->prev = _abfd->section_last; \
-+ _abfd->section_last->next = _s; \
-+ } \
-+ else \
-+ { \
-+ _s->prev = NULL; \
-+ _abfd->sections = _s; \
-+ } \
-+ _abfd->section_last = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_prepend(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ bfd *_abfd = ABFD; \
-+ _s->prev = NULL; \
-+ if (_abfd->sections) \
-+ { \
-+ _s->next = _abfd->sections; \
-+ _abfd->sections->prev = _s; \
-+ } \
-+ else \
-+ { \
-+ _s->next = NULL; \
-+ _abfd->section_last = _s; \
-+ } \
-+ _abfd->sections = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_insert_after(ABFD, A, S) \
-+ do \
-+ { \
-+ asection *_a = A; \
-+ asection *_s = S; \
-+ asection *_next = _a->next; \
-+ _s->next = _next; \
-+ _s->prev = _a; \
-+ _a->next = _s; \
-+ if (_next) \
-+ _next->prev = _s; \
-+ else \
-+ (ABFD)->section_last = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_insert_before(ABFD, B, S) \
-+ do \
-+ { \
-+ asection *_b = B; \
-+ asection *_s = S; \
-+ asection *_prev = _b->prev; \
-+ _s->prev = _prev; \
-+ _s->next = _b; \
-+ _b->prev = _s; \
-+ if (_prev) \
-+ _prev->next = _s; \
-+ else \
-+ (ABFD)->sections = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_removed_from_list(ABFD, S) \
-+ ((S)->next == NULL ? (ABFD)->section_last != (S) : (S)->next->prev != (S))
-+
-+#define BFD_FAKE_SECTION(SEC, FLAGS, SYM, NAME, IDX) \
-+ /* name, id, index, next, prev, flags, user_set_vma, */ \
-+ { NAME, IDX, 0, NULL, NULL, FLAGS, 0, \
-+ \
-+ /* linker_mark, linker_has_input, gc_mark, gc_mark_from_eh, */ \
-+ 0, 0, 1, 0, \
-+ \
-+ /* segment_mark, sec_info_type, use_rela_p, has_tls_reloc, */ \
-+ 0, 0, 0, 0, \
-+ \
-+ /* has_gp_reloc, need_finalize_relax, reloc_done, */ \
-+ 0, 0, 0, \
-+ \
-+ /* vma, lma, size, rawsize */ \
-+ 0, 0, 0, 0, \
-+ \
-+ /* output_offset, output_section, alignment_power, */ \
-+ 0, (struct bfd_section *) &SEC, 0, \
-+ \
-+ /* relocation, orelocation, reloc_count, filepos, rel_filepos, */ \
-+ NULL, NULL, 0, 0, 0, \
-+ \
-+ /* line_filepos, userdata, contents, lineno, lineno_count, */ \
-+ 0, NULL, NULL, NULL, 0, \
-+ \
-+ /* entsize, kept_section, moving_line_filepos, */ \
-+ 0, NULL, 0, \
-+ \
-+ /* target_index, used_by_bfd, constructor_chain, owner, */ \
-+ 0, NULL, NULL, NULL, \
-+ \
-+ /* symbol, symbol_ptr_ptr, */ \
-+ (struct bfd_symbol *) SYM, &SEC.symbol, \
-+ \
-+ /* map_head, map_tail */ \
-+ { NULL }, { NULL } \
-+ }
-+
-+void bfd_section_list_clear (bfd *);
-+
-+asection *bfd_get_section_by_name (bfd *abfd, const char *name);
-+
-+asection *bfd_get_section_by_name_if
-+ (bfd *abfd,
-+ const char *name,
-+ bfd_boolean (*func) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+char *bfd_get_unique_section_name
-+ (bfd *abfd, const char *templat, int *count);
-+
-+asection *bfd_make_section_old_way (bfd *abfd, const char *name);
-+
-+asection *bfd_make_section_anyway_with_flags
-+ (bfd *abfd, const char *name, flagword flags);
-+
-+asection *bfd_make_section_anyway (bfd *abfd, const char *name);
-+
-+asection *bfd_make_section_with_flags
-+ (bfd *, const char *name, flagword flags);
-+
-+asection *bfd_make_section (bfd *, const char *name);
-+
-+bfd_boolean bfd_set_section_flags
-+ (bfd *abfd, asection *sec, flagword flags);
-+
-+void bfd_map_over_sections
-+ (bfd *abfd,
-+ void (*func) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+asection *bfd_sections_find_if
-+ (bfd *abfd,
-+ bfd_boolean (*operation) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+bfd_boolean bfd_set_section_size
-+ (bfd *abfd, asection *sec, bfd_size_type val);
-+
-+bfd_boolean bfd_set_section_contents
-+ (bfd *abfd, asection *section, const void *data,
-+ file_ptr offset, bfd_size_type count);
-+
-+bfd_boolean bfd_get_section_contents
-+ (bfd *abfd, asection *section, void *location, file_ptr offset,
-+ bfd_size_type count);
-+
-+bfd_boolean bfd_malloc_and_get_section
-+ (bfd *abfd, asection *section, bfd_byte **buf);
-+
-+bfd_boolean bfd_copy_private_section_data
-+ (bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
-+
-+#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
-+ BFD_SEND (obfd, _bfd_copy_private_section_data, \
-+ (ibfd, isection, obfd, osection))
-+bfd_boolean bfd_generic_is_group_section (bfd *, const asection *sec);
-+
-+bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group);
-+
-+/* Extracted from archures.c. */
-+enum bfd_architecture
-+{
-+ bfd_arch_unknown, /* File arch not known. */
-+ bfd_arch_obscure, /* Arch known, not one of these. */
-+ bfd_arch_m68k, /* Motorola 68xxx */
-+#define bfd_mach_m68000 1
-+#define bfd_mach_m68008 2
-+#define bfd_mach_m68010 3
-+#define bfd_mach_m68020 4
-+#define bfd_mach_m68030 5
-+#define bfd_mach_m68040 6
-+#define bfd_mach_m68060 7
-+#define bfd_mach_cpu32 8
-+#define bfd_mach_fido 9
-+#define bfd_mach_mcf_isa_a_nodiv 10
-+#define bfd_mach_mcf_isa_a 11
-+#define bfd_mach_mcf_isa_a_mac 12
-+#define bfd_mach_mcf_isa_a_emac 13
-+#define bfd_mach_mcf_isa_aplus 14
-+#define bfd_mach_mcf_isa_aplus_mac 15
-+#define bfd_mach_mcf_isa_aplus_emac 16
-+#define bfd_mach_mcf_isa_b_nousp 17
-+#define bfd_mach_mcf_isa_b_nousp_mac 18
-+#define bfd_mach_mcf_isa_b_nousp_emac 19
-+#define bfd_mach_mcf_isa_b 20
-+#define bfd_mach_mcf_isa_b_mac 21
-+#define bfd_mach_mcf_isa_b_emac 22
-+#define bfd_mach_mcf_isa_b_float 23
-+#define bfd_mach_mcf_isa_b_float_mac 24
-+#define bfd_mach_mcf_isa_b_float_emac 25
-+#define bfd_mach_mcf_isa_c 26
-+#define bfd_mach_mcf_isa_c_mac 27
-+#define bfd_mach_mcf_isa_c_emac 28
-+ bfd_arch_vax, /* DEC Vax */
-+ bfd_arch_i960, /* Intel 960 */
-+ /* The order of the following is important.
-+ lower number indicates a machine type that
-+ only accepts a subset of the instructions
-+ available to machines with higher numbers.
-+ The exception is the "ca", which is
-+ incompatible with all other machines except
-+ "core". */
-+
-+#define bfd_mach_i960_core 1
-+#define bfd_mach_i960_ka_sa 2
-+#define bfd_mach_i960_kb_sb 3
-+#define bfd_mach_i960_mc 4
-+#define bfd_mach_i960_xa 5
-+#define bfd_mach_i960_ca 6
-+#define bfd_mach_i960_jx 7
-+#define bfd_mach_i960_hx 8
-+
-+ bfd_arch_or32, /* OpenRISC 32 */
-+
-+ bfd_arch_sparc, /* SPARC */
-+#define bfd_mach_sparc 1
-+/* The difference between v8plus and v9 is that v9 is a true 64 bit env. */
-+#define bfd_mach_sparc_sparclet 2
-+#define bfd_mach_sparc_sparclite 3
-+#define bfd_mach_sparc_v8plus 4
-+#define bfd_mach_sparc_v8plusa 5 /* with ultrasparc add'ns. */
-+#define bfd_mach_sparc_sparclite_le 6
-+#define bfd_mach_sparc_v9 7
-+#define bfd_mach_sparc_v9a 8 /* with ultrasparc add'ns. */
-+#define bfd_mach_sparc_v8plusb 9 /* with cheetah add'ns. */
-+#define bfd_mach_sparc_v9b 10 /* with cheetah add'ns. */
-+/* Nonzero if MACH has the v9 instruction set. */
-+#define bfd_mach_sparc_v9_p(mach) \
-+ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \
-+ && (mach) != bfd_mach_sparc_sparclite_le)
-+/* Nonzero if MACH is a 64 bit sparc architecture. */
-+#define bfd_mach_sparc_64bit_p(mach) \
-+ ((mach) >= bfd_mach_sparc_v9 && (mach) != bfd_mach_sparc_v8plusb)
-+ bfd_arch_spu, /* PowerPC SPU */
-+#define bfd_mach_spu 256
-+ bfd_arch_mips, /* MIPS Rxxxx */
-+#define bfd_mach_mips3000 3000
-+#define bfd_mach_mips3900 3900
-+#define bfd_mach_mips4000 4000
-+#define bfd_mach_mips4010 4010
-+#define bfd_mach_mips4100 4100
-+#define bfd_mach_mips4111 4111
-+#define bfd_mach_mips4120 4120
-+#define bfd_mach_mips4300 4300
-+#define bfd_mach_mips4400 4400
-+#define bfd_mach_mips4600 4600
-+#define bfd_mach_mips4650 4650
-+#define bfd_mach_mips5000 5000
-+#define bfd_mach_mips5400 5400
-+#define bfd_mach_mips5500 5500
-+#define bfd_mach_mips6000 6000
-+#define bfd_mach_mips7000 7000
-+#define bfd_mach_mips8000 8000
-+#define bfd_mach_mips9000 9000
-+#define bfd_mach_mips10000 10000
-+#define bfd_mach_mips12000 12000
-+#define bfd_mach_mips16 16
-+#define bfd_mach_mips5 5
-+#define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */
-+#define bfd_mach_mipsisa32 32
-+#define bfd_mach_mipsisa32r2 33
-+#define bfd_mach_mipsisa64 64
-+#define bfd_mach_mipsisa64r2 65
-+ bfd_arch_i386, /* Intel 386 */
-+#define bfd_mach_i386_i386 1
-+#define bfd_mach_i386_i8086 2
-+#define bfd_mach_i386_i386_intel_syntax 3
-+#define bfd_mach_x86_64 64
-+#define bfd_mach_x86_64_intel_syntax 65
-+ bfd_arch_we32k, /* AT&T WE32xxx */
-+ bfd_arch_tahoe, /* CCI/Harris Tahoe */
-+ bfd_arch_i860, /* Intel 860 */
-+ bfd_arch_i370, /* IBM 360/370 Mainframes */
-+ bfd_arch_romp, /* IBM ROMP PC/RT */
-+ bfd_arch_convex, /* Convex */
-+ bfd_arch_m88k, /* Motorola 88xxx */
-+ bfd_arch_m98k, /* Motorola 98xxx */
-+ bfd_arch_pyramid, /* Pyramid Technology */
-+ bfd_arch_h8300, /* Renesas H8/300 (formerly Hitachi H8/300) */
-+#define bfd_mach_h8300 1
-+#define bfd_mach_h8300h 2
-+#define bfd_mach_h8300s 3
-+#define bfd_mach_h8300hn 4
-+#define bfd_mach_h8300sn 5
-+#define bfd_mach_h8300sx 6
-+#define bfd_mach_h8300sxn 7
-+ bfd_arch_pdp11, /* DEC PDP-11 */
-+ bfd_arch_powerpc, /* PowerPC */
-+#define bfd_mach_ppc 32
-+#define bfd_mach_ppc64 64
-+#define bfd_mach_ppc_403 403
-+#define bfd_mach_ppc_403gc 4030
-+#define bfd_mach_ppc_505 505
-+#define bfd_mach_ppc_601 601
-+#define bfd_mach_ppc_602 602
-+#define bfd_mach_ppc_603 603
-+#define bfd_mach_ppc_ec603e 6031
-+#define bfd_mach_ppc_604 604
-+#define bfd_mach_ppc_620 620
-+#define bfd_mach_ppc_630 630
-+#define bfd_mach_ppc_750 750
-+#define bfd_mach_ppc_860 860
-+#define bfd_mach_ppc_a35 35
-+#define bfd_mach_ppc_rs64ii 642
-+#define bfd_mach_ppc_rs64iii 643
-+#define bfd_mach_ppc_7400 7400
-+#define bfd_mach_ppc_e500 500
-+ bfd_arch_rs6000, /* IBM RS/6000 */
-+#define bfd_mach_rs6k 6000
-+#define bfd_mach_rs6k_rs1 6001
-+#define bfd_mach_rs6k_rsc 6003
-+#define bfd_mach_rs6k_rs2 6002
-+ bfd_arch_hppa, /* HP PA RISC */
-+#define bfd_mach_hppa10 10
-+#define bfd_mach_hppa11 11
-+#define bfd_mach_hppa20 20
-+#define bfd_mach_hppa20w 25
-+ bfd_arch_d10v, /* Mitsubishi D10V */
-+#define bfd_mach_d10v 1
-+#define bfd_mach_d10v_ts2 2
-+#define bfd_mach_d10v_ts3 3
-+ bfd_arch_d30v, /* Mitsubishi D30V */
-+ bfd_arch_dlx, /* DLX */
-+ bfd_arch_m68hc11, /* Motorola 68HC11 */
-+ bfd_arch_m68hc12, /* Motorola 68HC12 */
-+#define bfd_mach_m6812_default 0
-+#define bfd_mach_m6812 1
-+#define bfd_mach_m6812s 2
-+ bfd_arch_z8k, /* Zilog Z8000 */
-+#define bfd_mach_z8001 1
-+#define bfd_mach_z8002 2
-+ bfd_arch_h8500, /* Renesas H8/500 (formerly Hitachi H8/500) */
-+ bfd_arch_sh, /* Renesas / SuperH SH (formerly Hitachi SH) */
-+#define bfd_mach_sh 1
-+#define bfd_mach_sh2 0x20
-+#define bfd_mach_sh_dsp 0x2d
-+#define bfd_mach_sh2a 0x2a
-+#define bfd_mach_sh2a_nofpu 0x2b
-+#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1
-+#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2
-+#define bfd_mach_sh2a_or_sh4 0x2a3
-+#define bfd_mach_sh2a_or_sh3e 0x2a4
-+#define bfd_mach_sh2e 0x2e
-+#define bfd_mach_sh3 0x30
-+#define bfd_mach_sh3_nommu 0x31
-+#define bfd_mach_sh3_dsp 0x3d
-+#define bfd_mach_sh3e 0x3e
-+#define bfd_mach_sh4 0x40
-+#define bfd_mach_sh4_nofpu 0x41
-+#define bfd_mach_sh4_nommu_nofpu 0x42
-+#define bfd_mach_sh4a 0x4a
-+#define bfd_mach_sh4a_nofpu 0x4b
-+#define bfd_mach_sh4al_dsp 0x4d
-+#define bfd_mach_sh5 0x50
-+ bfd_arch_alpha, /* Dec Alpha */
-+#define bfd_mach_alpha_ev4 0x10
-+#define bfd_mach_alpha_ev5 0x20
-+#define bfd_mach_alpha_ev6 0x30
-+ bfd_arch_arm, /* Advanced Risc Machines ARM. */
-+#define bfd_mach_arm_unknown 0
-+#define bfd_mach_arm_2 1
-+#define bfd_mach_arm_2a 2
-+#define bfd_mach_arm_3 3
-+#define bfd_mach_arm_3M 4
-+#define bfd_mach_arm_4 5
-+#define bfd_mach_arm_4T 6
-+#define bfd_mach_arm_5 7
-+#define bfd_mach_arm_5T 8
-+#define bfd_mach_arm_5TE 9
-+#define bfd_mach_arm_XScale 10
-+#define bfd_mach_arm_ep9312 11
-+#define bfd_mach_arm_iWMMXt 12
-+#define bfd_mach_arm_iWMMXt2 13
-+ bfd_arch_ns32k, /* National Semiconductors ns32000 */
-+ bfd_arch_w65, /* WDC 65816 */
-+ bfd_arch_tic30, /* Texas Instruments TMS320C30 */
-+ bfd_arch_tic4x, /* Texas Instruments TMS320C3X/4X */
-+#define bfd_mach_tic3x 30
-+#define bfd_mach_tic4x 40
-+ bfd_arch_tic54x, /* Texas Instruments TMS320C54X */
-+ bfd_arch_tic80, /* TI TMS320c80 (MVP) */
-+ bfd_arch_v850, /* NEC V850 */
-+#define bfd_mach_v850 1
-+#define bfd_mach_v850e 'E'
-+#define bfd_mach_v850e1 '1'
-+ bfd_arch_arc, /* ARC Cores */
-+#define bfd_mach_arc_5 5
-+#define bfd_mach_arc_6 6
-+#define bfd_mach_arc_7 7
-+#define bfd_mach_arc_8 8
-+ bfd_arch_m32c, /* Renesas M16C/M32C. */
-+#define bfd_mach_m16c 0x75
-+#define bfd_mach_m32c 0x78
-+ bfd_arch_m32r, /* Renesas M32R (formerly Mitsubishi M32R/D) */
-+#define bfd_mach_m32r 1 /* For backwards compatibility. */
-+#define bfd_mach_m32rx 'x'
-+#define bfd_mach_m32r2 '2'
-+ bfd_arch_mn10200, /* Matsushita MN10200 */
-+ bfd_arch_mn10300, /* Matsushita MN10300 */
-+#define bfd_mach_mn10300 300
-+#define bfd_mach_am33 330
-+#define bfd_mach_am33_2 332
-+ bfd_arch_fr30,
-+#define bfd_mach_fr30 0x46523330
-+ bfd_arch_frv,
-+#define bfd_mach_frv 1
-+#define bfd_mach_frvsimple 2
-+#define bfd_mach_fr300 300
-+#define bfd_mach_fr400 400
-+#define bfd_mach_fr450 450
-+#define bfd_mach_frvtomcat 499 /* fr500 prototype */
-+#define bfd_mach_fr500 500
-+#define bfd_mach_fr550 550
-+ bfd_arch_mcore,
-+ bfd_arch_mep,
-+#define bfd_mach_mep 1
-+#define bfd_mach_mep_h1 0x6831
-+ bfd_arch_ia64, /* HP/Intel ia64 */
-+#define bfd_mach_ia64_elf64 64
-+#define bfd_mach_ia64_elf32 32
-+ bfd_arch_ip2k, /* Ubicom IP2K microcontrollers. */
-+#define bfd_mach_ip2022 1
-+#define bfd_mach_ip2022ext 2
-+ bfd_arch_iq2000, /* Vitesse IQ2000. */
-+#define bfd_mach_iq2000 1
-+#define bfd_mach_iq10 2
-+ bfd_arch_mt,
-+#define bfd_mach_ms1 1
-+#define bfd_mach_mrisc2 2
-+#define bfd_mach_ms2 3
-+ bfd_arch_pj,
-+ bfd_arch_avr, /* Atmel AVR microcontrollers. */
-+#define bfd_mach_avr1 1
-+#define bfd_mach_avr2 2
-+#define bfd_mach_avr3 3
-+#define bfd_mach_avr4 4
-+#define bfd_mach_avr5 5
-+#define bfd_mach_avr6 6
-+ bfd_arch_bfin, /* ADI Blackfin */
-+#define bfd_mach_bfin 1
-+ bfd_arch_cr16, /* National Semiconductor CompactRISC (ie CR16). */
-+#define bfd_mach_cr16 1
-+ bfd_arch_cr16c, /* National Semiconductor CompactRISC. */
-+#define bfd_mach_cr16c 1
-+ bfd_arch_crx, /* National Semiconductor CRX. */
-+#define bfd_mach_crx 1
-+ bfd_arch_cris, /* Axis CRIS */
-+#define bfd_mach_cris_v0_v10 255
-+#define bfd_mach_cris_v32 32
-+#define bfd_mach_cris_v10_v32 1032
-+ bfd_arch_s390, /* IBM s390 */
-+#define bfd_mach_s390_31 31
-+#define bfd_mach_s390_64 64
-+ bfd_arch_score, /* Sunplus score */
-+ bfd_arch_openrisc, /* OpenRISC */
-+ bfd_arch_mmix, /* Donald Knuth's educational processor. */
-+ bfd_arch_xstormy16,
-+#define bfd_mach_xstormy16 1
-+ bfd_arch_msp430, /* Texas Instruments MSP430 architecture. */
-+#define bfd_mach_msp11 11
-+#define bfd_mach_msp110 110
-+#define bfd_mach_msp12 12
-+#define bfd_mach_msp13 13
-+#define bfd_mach_msp14 14
-+#define bfd_mach_msp15 15
-+#define bfd_mach_msp16 16
-+#define bfd_mach_msp21 21
-+#define bfd_mach_msp31 31
-+#define bfd_mach_msp32 32
-+#define bfd_mach_msp33 33
-+#define bfd_mach_msp41 41
-+#define bfd_mach_msp42 42
-+#define bfd_mach_msp43 43
-+#define bfd_mach_msp44 44
-+ bfd_arch_xc16x, /* Infineon's XC16X Series. */
-+#define bfd_mach_xc16x 1
-+#define bfd_mach_xc16xl 2
-+#define bfd_mach_xc16xs 3
-+ bfd_arch_xtensa, /* Tensilica's Xtensa cores. */
-+#define bfd_mach_xtensa 1
-+ bfd_arch_maxq, /* Dallas MAXQ 10/20 */
-+#define bfd_mach_maxq10 10
-+#define bfd_mach_maxq20 20
-+ bfd_arch_z80,
-+#define bfd_mach_z80strict 1 /* No undocumented opcodes. */
-+#define bfd_mach_z80 3 /* With ixl, ixh, iyl, and iyh. */
-+#define bfd_mach_z80full 7 /* All undocumented instructions. */
-+#define bfd_mach_r800 11 /* R800: successor with multiplication. */
-+ bfd_arch_last
-+ };
-+
-+typedef struct bfd_arch_info
-+{
-+ int bits_per_word;
-+ int bits_per_address;
-+ int bits_per_byte;
-+ enum bfd_architecture arch;
-+ unsigned long mach;
-+ const char *arch_name;
-+ const char *printable_name;
-+ unsigned int section_align_power;
-+ /* TRUE if this is the default machine for the architecture.
-+ The default arch should be the first entry for an arch so that
-+ all the entries for that arch can be accessed via <<next>>. */
-+ bfd_boolean the_default;
-+ const struct bfd_arch_info * (*compatible)
-+ (const struct bfd_arch_info *a, const struct bfd_arch_info *b);
-+
-+ bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
-+
-+ const struct bfd_arch_info *next;
-+}
-+bfd_arch_info_type;
-+
-+const char *bfd_printable_name (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_scan_arch (const char *string);
-+
-+const char **bfd_arch_list (void);
-+
-+const bfd_arch_info_type *bfd_arch_get_compatible
-+ (const bfd *abfd, const bfd *bbfd, bfd_boolean accept_unknowns);
-+
-+void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
-+
-+enum bfd_architecture bfd_get_arch (bfd *abfd);
-+
-+unsigned long bfd_get_mach (bfd *abfd);
-+
-+unsigned int bfd_arch_bits_per_byte (bfd *abfd);
-+
-+unsigned int bfd_arch_bits_per_address (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_get_arch_info (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_lookup_arch
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+const char *bfd_printable_arch_mach
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+unsigned int bfd_octets_per_byte (bfd *abfd);
-+
-+unsigned int bfd_arch_mach_octets_per_byte
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+/* Extracted from reloc.c. */
-+typedef enum bfd_reloc_status
-+{
-+ /* No errors detected. */
-+ bfd_reloc_ok,
-+
-+ /* The relocation was performed, but there was an overflow. */
-+ bfd_reloc_overflow,
-+
-+ /* The address to relocate was not within the section supplied. */
-+ bfd_reloc_outofrange,
-+
-+ /* Used by special functions. */
-+ bfd_reloc_continue,
-+
-+ /* Unsupported relocation size requested. */
-+ bfd_reloc_notsupported,
-+
-+ /* Unused. */
-+ bfd_reloc_other,
-+
-+ /* The symbol to relocate against was undefined. */
-+ bfd_reloc_undefined,
-+
-+ /* The relocation was performed, but may not be ok - presently
-+ generated only when linking i960 coff files with i960 b.out
-+ symbols. If this type is returned, the error_message argument
-+ to bfd_perform_relocation will be set. */
-+ bfd_reloc_dangerous
-+ }
-+ bfd_reloc_status_type;
-+
-+
-+typedef struct reloc_cache_entry
-+{
-+ /* A pointer into the canonical table of pointers. */
-+ struct bfd_symbol **sym_ptr_ptr;
-+
-+ /* offset in section. */
-+ bfd_size_type address;
-+
-+ /* addend for relocation value. */
-+ bfd_vma addend;
-+
-+ /* Pointer to how to perform the required relocation. */
-+ reloc_howto_type *howto;
-+
-+}
-+arelent;
-+
-+enum complain_overflow
-+{
-+ /* Do not complain on overflow. */
-+ complain_overflow_dont,
-+
-+ /* Complain if the value overflows when considered as a signed
-+ number one bit larger than the field. ie. A bitfield of N bits
-+ is allowed to represent -2**n to 2**n-1. */
-+ complain_overflow_bitfield,
-+
-+ /* Complain if the value overflows when considered as a signed
-+ number. */
-+ complain_overflow_signed,
-+
-+ /* Complain if the value overflows when considered as an
-+ unsigned number. */
-+ complain_overflow_unsigned
-+};
-+
-+struct reloc_howto_struct
-+{
-+ /* The type field has mainly a documentary use - the back end can
-+ do what it wants with it, though normally the back end's
-+ external idea of what a reloc number is stored
-+ in this field. For example, a PC relative word relocation
-+ in a coff environment has the type 023 - because that's
-+ what the outside world calls a R_PCRWORD reloc. */
-+ unsigned int type;
-+
-+ /* The value the final relocation is shifted right by. This drops
-+ unwanted data from the relocation. */
-+ unsigned int rightshift;
-+
-+ /* The size of the item to be relocated. This is *not* a
-+ power-of-two measure. To get the number of bytes operated
-+ on by a type of relocation, use bfd_get_reloc_size. */
-+ int size;
-+
-+ /* The number of bits in the item to be relocated. This is used
-+ when doing overflow checking. */
-+ unsigned int bitsize;
-+
-+ /* Notes that the relocation is relative to the location in the
-+ data section of the addend. The relocation function will
-+ subtract from the relocation value the address of the location
-+ being relocated. */
-+ bfd_boolean pc_relative;
-+
-+ /* The bit position of the reloc value in the destination.
-+ The relocated value is left shifted by this amount. */
-+ unsigned int bitpos;
-+
-+ /* What type of overflow error should be checked for when
-+ relocating. */
-+ enum complain_overflow complain_on_overflow;
-+
-+ /* If this field is non null, then the supplied function is
-+ called rather than the normal function. This allows really
-+ strange relocation methods to be accommodated (e.g., i960 callj
-+ instructions). */
-+ bfd_reloc_status_type (*special_function)
-+ (bfd *, arelent *, struct bfd_symbol *, void *, asection *,
-+ bfd *, char **);
-+
-+ /* The textual name of the relocation type. */
-+ char *name;
-+
-+ /* Some formats record a relocation addend in the section contents
-+ rather than with the relocation. For ELF formats this is the
-+ distinction between USE_REL and USE_RELA (though the code checks
-+ for USE_REL == 1/0). The value of this field is TRUE if the
-+ addend is recorded with the section contents; when performing a
-+ partial link (ld -r) the section contents (the data) will be
-+ modified. The value of this field is FALSE if addends are
-+ recorded with the relocation (in arelent.addend); when performing
-+ a partial link the relocation will be modified.
-+ All relocations for all ELF USE_RELA targets should set this field
-+ to FALSE (values of TRUE should be looked on with suspicion).
-+ However, the converse is not true: not all relocations of all ELF
-+ USE_REL targets set this field to TRUE. Why this is so is peculiar
-+ to each particular target. For relocs that aren't used in partial
-+ links (e.g. GOT stuff) it doesn't matter what this is set to. */
-+ bfd_boolean partial_inplace;
-+
-+ /* src_mask selects the part of the instruction (or data) to be used
-+ in the relocation sum. If the target relocations don't have an
-+ addend in the reloc, eg. ELF USE_REL, src_mask will normally equal
-+ dst_mask to extract the addend from the section contents. If
-+ relocations do have an addend in the reloc, eg. ELF USE_RELA, this
-+ field should be zero. Non-zero values for ELF USE_RELA targets are
-+ bogus as in those cases the value in the dst_mask part of the
-+ section contents should be treated as garbage. */
-+ bfd_vma src_mask;
-+
-+ /* dst_mask selects which parts of the instruction (or data) are
-+ replaced with a relocated value. */
-+ bfd_vma dst_mask;
-+
-+ /* When some formats create PC relative instructions, they leave
-+ the value of the pc of the place being relocated in the offset
-+ slot of the instruction, so that a PC relative relocation can
-+ be made just by adding in an ordinary offset (e.g., sun3 a.out).
-+ Some formats leave the displacement part of an instruction
-+ empty (e.g., m88k bcs); this flag signals the fact. */
-+ bfd_boolean pcrel_offset;
-+};
-+
-+#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
-+ { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
-+#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
-+ HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
-+ NAME, FALSE, 0, 0, IN)
-+
-+#define EMPTY_HOWTO(C) \
-+ HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
-+ NULL, FALSE, 0, 0, FALSE)
-+
-+#define HOWTO_PREPARE(relocation, symbol) \
-+ { \
-+ if (symbol != NULL) \
-+ { \
-+ if (bfd_is_com_section (symbol->section)) \
-+ { \
-+ relocation = 0; \
-+ } \
-+ else \
-+ { \
-+ relocation = symbol->value; \
-+ } \
-+ } \
-+ }
-+
-+unsigned int bfd_get_reloc_size (reloc_howto_type *);
-+
-+typedef struct relent_chain
-+{
-+ arelent relent;
-+ struct relent_chain *next;
-+}
-+arelent_chain;
-+
-+bfd_reloc_status_type bfd_check_overflow
-+ (enum complain_overflow how,
-+ unsigned int bitsize,
-+ unsigned int rightshift,
-+ unsigned int addrsize,
-+ bfd_vma relocation);
-+
-+bfd_reloc_status_type bfd_perform_relocation
-+ (bfd *abfd,
-+ arelent *reloc_entry,
-+ void *data,
-+ asection *input_section,
-+ bfd *output_bfd,
-+ char **error_message);
-+
-+bfd_reloc_status_type bfd_install_relocation
-+ (bfd *abfd,
-+ arelent *reloc_entry,
-+ void *data, bfd_vma data_start,
-+ asection *input_section,
-+ char **error_message);
-+
-+enum bfd_reloc_code_real {
-+ _dummy_first_bfd_reloc_code_real,
-+
-+
-+/* Basic absolute relocations of N bits. */
-+ BFD_RELOC_64,
-+ BFD_RELOC_32,
-+ BFD_RELOC_26,
-+ BFD_RELOC_24,
-+ BFD_RELOC_16,
-+ BFD_RELOC_14,
-+ BFD_RELOC_8,
-+
-+/* PC-relative relocations. Sometimes these are relative to the address
-+of the relocation itself; sometimes they are relative to the start of
-+the section containing the relocation. It depends on the specific target.
-+
-+The 24-bit relocation is used in some Intel 960 configurations. */
-+ BFD_RELOC_64_PCREL,
-+ BFD_RELOC_32_PCREL,
-+ BFD_RELOC_24_PCREL,
-+ BFD_RELOC_16_PCREL,
-+ BFD_RELOC_12_PCREL,
-+ BFD_RELOC_8_PCREL,
-+
-+/* Section relative relocations. Some targets need this for DWARF2. */
-+ BFD_RELOC_32_SECREL,
-+
-+/* For ELF. */
-+ BFD_RELOC_32_GOT_PCREL,
-+ BFD_RELOC_16_GOT_PCREL,
-+ BFD_RELOC_8_GOT_PCREL,
-+ BFD_RELOC_32_GOTOFF,
-+ BFD_RELOC_16_GOTOFF,
-+ BFD_RELOC_LO16_GOTOFF,
-+ BFD_RELOC_HI16_GOTOFF,
-+ BFD_RELOC_HI16_S_GOTOFF,
-+ BFD_RELOC_8_GOTOFF,
-+ BFD_RELOC_64_PLT_PCREL,
-+ BFD_RELOC_32_PLT_PCREL,
-+ BFD_RELOC_24_PLT_PCREL,
-+ BFD_RELOC_16_PLT_PCREL,
-+ BFD_RELOC_8_PLT_PCREL,
-+ BFD_RELOC_64_PLTOFF,
-+ BFD_RELOC_32_PLTOFF,
-+ BFD_RELOC_16_PLTOFF,
-+ BFD_RELOC_LO16_PLTOFF,
-+ BFD_RELOC_HI16_PLTOFF,
-+ BFD_RELOC_HI16_S_PLTOFF,
-+ BFD_RELOC_8_PLTOFF,
-+
-+/* Relocations used by 68K ELF. */
-+ BFD_RELOC_68K_GLOB_DAT,
-+ BFD_RELOC_68K_JMP_SLOT,
-+ BFD_RELOC_68K_RELATIVE,
-+
-+/* Linkage-table relative. */
-+ BFD_RELOC_32_BASEREL,
-+ BFD_RELOC_16_BASEREL,
-+ BFD_RELOC_LO16_BASEREL,
-+ BFD_RELOC_HI16_BASEREL,
-+ BFD_RELOC_HI16_S_BASEREL,
-+ BFD_RELOC_8_BASEREL,
-+ BFD_RELOC_RVA,
-+
-+/* Absolute 8-bit relocation, but used to form an address like 0xFFnn. */
-+ BFD_RELOC_8_FFnn,
-+
-+/* These PC-relative relocations are stored as word displacements --
-+i.e., byte displacements shifted right two bits. The 30-bit word
-+displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
-+SPARC. (SPARC tools generally refer to this as <<WDISP30>>.) The
-+signed 16-bit displacement is used on the MIPS, and the 23-bit
-+displacement is used on the Alpha. */
-+ BFD_RELOC_32_PCREL_S2,
-+ BFD_RELOC_16_PCREL_S2,
-+ BFD_RELOC_23_PCREL_S2,
-+
-+/* High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
-+the target word. These are used on the SPARC. */
-+ BFD_RELOC_HI22,
-+ BFD_RELOC_LO10,
-+
-+/* For systems that allocate a Global Pointer register, these are
-+displacements off that register. These relocation types are
-+handled specially, because the value the register will have is
-+decided relatively late. */
-+ BFD_RELOC_GPREL16,
-+ BFD_RELOC_GPREL32,
-+
-+/* Reloc types used for i960/b.out. */
-+ BFD_RELOC_I960_CALLJ,
-+
-+/* SPARC ELF relocations. There is probably some overlap with other
-+relocation types already defined. */
-+ BFD_RELOC_NONE,
-+ BFD_RELOC_SPARC_WDISP22,
-+ BFD_RELOC_SPARC22,
-+ BFD_RELOC_SPARC13,
-+ BFD_RELOC_SPARC_GOT10,
-+ BFD_RELOC_SPARC_GOT13,
-+ BFD_RELOC_SPARC_GOT22,
-+ BFD_RELOC_SPARC_PC10,
-+ BFD_RELOC_SPARC_PC22,
-+ BFD_RELOC_SPARC_WPLT30,
-+ BFD_RELOC_SPARC_COPY,
-+ BFD_RELOC_SPARC_GLOB_DAT,
-+ BFD_RELOC_SPARC_JMP_SLOT,
-+ BFD_RELOC_SPARC_RELATIVE,
-+ BFD_RELOC_SPARC_UA16,
-+ BFD_RELOC_SPARC_UA32,
-+ BFD_RELOC_SPARC_UA64,
-+
-+/* I think these are specific to SPARC a.out (e.g., Sun 4). */
-+ BFD_RELOC_SPARC_BASE13,
-+ BFD_RELOC_SPARC_BASE22,
-+
-+/* SPARC64 relocations */
-+#define BFD_RELOC_SPARC_64 BFD_RELOC_64
-+ BFD_RELOC_SPARC_10,
-+ BFD_RELOC_SPARC_11,
-+ BFD_RELOC_SPARC_OLO10,
-+ BFD_RELOC_SPARC_HH22,
-+ BFD_RELOC_SPARC_HM10,
-+ BFD_RELOC_SPARC_LM22,
-+ BFD_RELOC_SPARC_PC_HH22,
-+ BFD_RELOC_SPARC_PC_HM10,
-+ BFD_RELOC_SPARC_PC_LM22,
-+ BFD_RELOC_SPARC_WDISP16,
-+ BFD_RELOC_SPARC_WDISP19,
-+ BFD_RELOC_SPARC_7,
-+ BFD_RELOC_SPARC_6,
-+ BFD_RELOC_SPARC_5,
-+#define BFD_RELOC_SPARC_DISP64 BFD_RELOC_64_PCREL
-+ BFD_RELOC_SPARC_PLT32,
-+ BFD_RELOC_SPARC_PLT64,
-+ BFD_RELOC_SPARC_HIX22,
-+ BFD_RELOC_SPARC_LOX10,
-+ BFD_RELOC_SPARC_H44,
-+ BFD_RELOC_SPARC_M44,
-+ BFD_RELOC_SPARC_L44,
-+ BFD_RELOC_SPARC_REGISTER,
-+
-+/* SPARC little endian relocation */
-+ BFD_RELOC_SPARC_REV32,
-+
-+/* SPARC TLS relocations */
-+ BFD_RELOC_SPARC_TLS_GD_HI22,
-+ BFD_RELOC_SPARC_TLS_GD_LO10,
-+ BFD_RELOC_SPARC_TLS_GD_ADD,
-+ BFD_RELOC_SPARC_TLS_GD_CALL,
-+ BFD_RELOC_SPARC_TLS_LDM_HI22,
-+ BFD_RELOC_SPARC_TLS_LDM_LO10,
-+ BFD_RELOC_SPARC_TLS_LDM_ADD,
-+ BFD_RELOC_SPARC_TLS_LDM_CALL,
-+ BFD_RELOC_SPARC_TLS_LDO_HIX22,
-+ BFD_RELOC_SPARC_TLS_LDO_LOX10,
-+ BFD_RELOC_SPARC_TLS_LDO_ADD,
-+ BFD_RELOC_SPARC_TLS_IE_HI22,
-+ BFD_RELOC_SPARC_TLS_IE_LO10,
-+ BFD_RELOC_SPARC_TLS_IE_LD,
-+ BFD_RELOC_SPARC_TLS_IE_LDX,
-+ BFD_RELOC_SPARC_TLS_IE_ADD,
-+ BFD_RELOC_SPARC_TLS_LE_HIX22,
-+ BFD_RELOC_SPARC_TLS_LE_LOX10,
-+ BFD_RELOC_SPARC_TLS_DTPMOD32,
-+ BFD_RELOC_SPARC_TLS_DTPMOD64,
-+ BFD_RELOC_SPARC_TLS_DTPOFF32,
-+ BFD_RELOC_SPARC_TLS_DTPOFF64,
-+ BFD_RELOC_SPARC_TLS_TPOFF32,
-+ BFD_RELOC_SPARC_TLS_TPOFF64,
-+
-+/* SPU Relocations. */
-+ BFD_RELOC_SPU_IMM7,
-+ BFD_RELOC_SPU_IMM8,
-+ BFD_RELOC_SPU_IMM10,
-+ BFD_RELOC_SPU_IMM10W,
-+ BFD_RELOC_SPU_IMM16,
-+ BFD_RELOC_SPU_IMM16W,
-+ BFD_RELOC_SPU_IMM18,
-+ BFD_RELOC_SPU_PCREL9a,
-+ BFD_RELOC_SPU_PCREL9b,
-+ BFD_RELOC_SPU_PCREL16,
-+ BFD_RELOC_SPU_LO16,
-+ BFD_RELOC_SPU_HI16,
-+ BFD_RELOC_SPU_PPU32,
-+ BFD_RELOC_SPU_PPU64,
-+
-+/* Alpha ECOFF and ELF relocations. Some of these treat the symbol or
-+"addend" in some special way.
-+For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
-+writing; when reading, it will be the absolute section symbol. The
-+addend is the displacement in bytes of the "lda" instruction from
-+the "ldah" instruction (which is at the address of this reloc). */
-+ BFD_RELOC_ALPHA_GPDISP_HI16,
-+
-+/* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
-+with GPDISP_HI16 relocs. The addend is ignored when writing the
-+relocations out, and is filled in with the file's GP value on
-+reading, for convenience. */
-+ BFD_RELOC_ALPHA_GPDISP_LO16,
-+
-+/* The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
-+relocation except that there is no accompanying GPDISP_LO16
-+relocation. */
-+ BFD_RELOC_ALPHA_GPDISP,
-+
-+/* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
-+the assembler turns it into a LDQ instruction to load the address of
-+the symbol, and then fills in a register in the real instruction.
-+
-+The LITERAL reloc, at the LDQ instruction, refers to the .lita
-+section symbol. The addend is ignored when writing, but is filled
-+in with the file's GP value on reading, for convenience, as with the
-+GPDISP_LO16 reloc.
-+
-+The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
-+It should refer to the symbol to be referenced, as with 16_GOTOFF,
-+but it generates output not based on the position within the .got
-+section, but relative to the GP value chosen for the file during the
-+final link stage.
-+
-+The LITUSE reloc, on the instruction using the loaded address, gives
-+information to the linker that it might be able to use to optimize
-+away some literal section references. The symbol is ignored (read
-+as the absolute section symbol), and the "addend" indicates the type
-+of instruction using the register:
-+1 - "memory" fmt insn
-+2 - byte-manipulation (byte offset reg)
-+3 - jsr (target of branch) */
-+ BFD_RELOC_ALPHA_LITERAL,
-+ BFD_RELOC_ALPHA_ELF_LITERAL,
-+ BFD_RELOC_ALPHA_LITUSE,
-+
-+/* The HINT relocation indicates a value that should be filled into the
-+"hint" field of a jmp/jsr/ret instruction, for possible branch-
-+prediction logic which may be provided on some processors. */
-+ BFD_RELOC_ALPHA_HINT,
-+
-+/* The LINKAGE relocation outputs a linkage pair in the object file,
-+which is filled by the linker. */
-+ BFD_RELOC_ALPHA_LINKAGE,
-+
-+/* The CODEADDR relocation outputs a STO_CA in the object file,
-+which is filled by the linker. */
-+ BFD_RELOC_ALPHA_CODEADDR,
-+
-+/* The GPREL_HI/LO relocations together form a 32-bit offset from the
-+GP register. */
-+ BFD_RELOC_ALPHA_GPREL_HI16,
-+ BFD_RELOC_ALPHA_GPREL_LO16,
-+
-+/* Like BFD_RELOC_23_PCREL_S2, except that the source and target must
-+share a common GP, and the target address is adjusted for
-+STO_ALPHA_STD_GPLOAD. */
-+ BFD_RELOC_ALPHA_BRSGP,
-+
-+/* Alpha thread-local storage relocations. */
-+ BFD_RELOC_ALPHA_TLSGD,
-+ BFD_RELOC_ALPHA_TLSLDM,
-+ BFD_RELOC_ALPHA_DTPMOD64,
-+ BFD_RELOC_ALPHA_GOTDTPREL16,
-+ BFD_RELOC_ALPHA_DTPREL64,
-+ BFD_RELOC_ALPHA_DTPREL_HI16,
-+ BFD_RELOC_ALPHA_DTPREL_LO16,
-+ BFD_RELOC_ALPHA_DTPREL16,
-+ BFD_RELOC_ALPHA_GOTTPREL16,
-+ BFD_RELOC_ALPHA_TPREL64,
-+ BFD_RELOC_ALPHA_TPREL_HI16,
-+ BFD_RELOC_ALPHA_TPREL_LO16,
-+ BFD_RELOC_ALPHA_TPREL16,
-+
-+/* Bits 27..2 of the relocation address shifted right 2 bits;
-+simple reloc otherwise. */
-+ BFD_RELOC_MIPS_JMP,
-+
-+/* The MIPS16 jump instruction. */
-+ BFD_RELOC_MIPS16_JMP,
-+
-+/* MIPS16 GP relative reloc. */
-+ BFD_RELOC_MIPS16_GPREL,
-+
-+/* High 16 bits of 32-bit value; simple reloc. */
-+ BFD_RELOC_HI16,
-+
-+/* High 16 bits of 32-bit value but the low 16 bits will be sign
-+extended and added to form the final result. If the low 16
-+bits form a negative number, we need to add one to the high value
-+to compensate for the borrow when the low bits are added. */
-+ BFD_RELOC_HI16_S,
-+
-+/* Low 16 bits. */
-+ BFD_RELOC_LO16,
-+
-+/* High 16 bits of 32-bit pc-relative value */
-+ BFD_RELOC_HI16_PCREL,
-+
-+/* High 16 bits of 32-bit pc-relative value, adjusted */
-+ BFD_RELOC_HI16_S_PCREL,
-+
-+/* Low 16 bits of pc-relative value */
-+ BFD_RELOC_LO16_PCREL,
-+
-+/* MIPS16 high 16 bits of 32-bit value. */
-+ BFD_RELOC_MIPS16_HI16,
-+
-+/* MIPS16 high 16 bits of 32-bit value but the low 16 bits will be sign
-+extended and added to form the final result. If the low 16
-+bits form a negative number, we need to add one to the high value
-+to compensate for the borrow when the low bits are added. */
-+ BFD_RELOC_MIPS16_HI16_S,
-+
-+/* MIPS16 low 16 bits. */
-+ BFD_RELOC_MIPS16_LO16,
-+
-+/* Relocation against a MIPS literal section. */
-+ BFD_RELOC_MIPS_LITERAL,
-+
-+/* MIPS ELF relocations. */
-+ BFD_RELOC_MIPS_GOT16,
-+ BFD_RELOC_MIPS_CALL16,
-+ BFD_RELOC_MIPS_GOT_HI16,
-+ BFD_RELOC_MIPS_GOT_LO16,
-+ BFD_RELOC_MIPS_CALL_HI16,
-+ BFD_RELOC_MIPS_CALL_LO16,
-+ BFD_RELOC_MIPS_SUB,
-+ BFD_RELOC_MIPS_GOT_PAGE,
-+ BFD_RELOC_MIPS_GOT_OFST,
-+ BFD_RELOC_MIPS_GOT_DISP,
-+ BFD_RELOC_MIPS_SHIFT5,
-+ BFD_RELOC_MIPS_SHIFT6,
-+ BFD_RELOC_MIPS_INSERT_A,
-+ BFD_RELOC_MIPS_INSERT_B,
-+ BFD_RELOC_MIPS_DELETE,
-+ BFD_RELOC_MIPS_HIGHEST,
-+ BFD_RELOC_MIPS_HIGHER,
-+ BFD_RELOC_MIPS_SCN_DISP,
-+ BFD_RELOC_MIPS_REL16,
-+ BFD_RELOC_MIPS_RELGOT,
-+ BFD_RELOC_MIPS_JALR,
-+ BFD_RELOC_MIPS_TLS_DTPMOD32,
-+ BFD_RELOC_MIPS_TLS_DTPREL32,
-+ BFD_RELOC_MIPS_TLS_DTPMOD64,
-+ BFD_RELOC_MIPS_TLS_DTPREL64,
-+ BFD_RELOC_MIPS_TLS_GD,
-+ BFD_RELOC_MIPS_TLS_LDM,
-+ BFD_RELOC_MIPS_TLS_DTPREL_HI16,
-+ BFD_RELOC_MIPS_TLS_DTPREL_LO16,
-+ BFD_RELOC_MIPS_TLS_GOTTPREL,
-+ BFD_RELOC_MIPS_TLS_TPREL32,
-+ BFD_RELOC_MIPS_TLS_TPREL64,
-+ BFD_RELOC_MIPS_TLS_TPREL_HI16,
-+ BFD_RELOC_MIPS_TLS_TPREL_LO16,
-+
-+
-+/* MIPS ELF relocations (VxWorks extensions). */
-+ BFD_RELOC_MIPS_COPY,
-+ BFD_RELOC_MIPS_JUMP_SLOT,
-+
-+
-+/* Fujitsu Frv Relocations. */
-+ BFD_RELOC_FRV_LABEL16,
-+ BFD_RELOC_FRV_LABEL24,
-+ BFD_RELOC_FRV_LO16,
-+ BFD_RELOC_FRV_HI16,
-+ BFD_RELOC_FRV_GPREL12,
-+ BFD_RELOC_FRV_GPRELU12,
-+ BFD_RELOC_FRV_GPREL32,
-+ BFD_RELOC_FRV_GPRELHI,
-+ BFD_RELOC_FRV_GPRELLO,
-+ BFD_RELOC_FRV_GOT12,
-+ BFD_RELOC_FRV_GOTHI,
-+ BFD_RELOC_FRV_GOTLO,
-+ BFD_RELOC_FRV_FUNCDESC,
-+ BFD_RELOC_FRV_FUNCDESC_GOT12,
-+ BFD_RELOC_FRV_FUNCDESC_GOTHI,
-+ BFD_RELOC_FRV_FUNCDESC_GOTLO,
-+ BFD_RELOC_FRV_FUNCDESC_VALUE,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFF12,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFFHI,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFFLO,
-+ BFD_RELOC_FRV_GOTOFF12,
-+ BFD_RELOC_FRV_GOTOFFHI,
-+ BFD_RELOC_FRV_GOTOFFLO,
-+ BFD_RELOC_FRV_GETTLSOFF,
-+ BFD_RELOC_FRV_TLSDESC_VALUE,
-+ BFD_RELOC_FRV_GOTTLSDESC12,
-+ BFD_RELOC_FRV_GOTTLSDESCHI,
-+ BFD_RELOC_FRV_GOTTLSDESCLO,
-+ BFD_RELOC_FRV_TLSMOFF12,
-+ BFD_RELOC_FRV_TLSMOFFHI,
-+ BFD_RELOC_FRV_TLSMOFFLO,
-+ BFD_RELOC_FRV_GOTTLSOFF12,
-+ BFD_RELOC_FRV_GOTTLSOFFHI,
-+ BFD_RELOC_FRV_GOTTLSOFFLO,
-+ BFD_RELOC_FRV_TLSOFF,
-+ BFD_RELOC_FRV_TLSDESC_RELAX,
-+ BFD_RELOC_FRV_GETTLSOFF_RELAX,
-+ BFD_RELOC_FRV_TLSOFF_RELAX,
-+ BFD_RELOC_FRV_TLSMOFF,
-+
-+
-+/* This is a 24bit GOT-relative reloc for the mn10300. */
-+ BFD_RELOC_MN10300_GOTOFF24,
-+
-+/* This is a 32bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT32,
-+
-+/* This is a 24bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT24,
-+
-+/* This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT16,
-+
-+/* Copy symbol at runtime. */
-+ BFD_RELOC_MN10300_COPY,
-+
-+/* Create GOT entry. */
-+ BFD_RELOC_MN10300_GLOB_DAT,
-+
-+/* Create PLT entry. */
-+ BFD_RELOC_MN10300_JMP_SLOT,
-+
-+/* Adjust by program base. */
-+ BFD_RELOC_MN10300_RELATIVE,
-+
-+
-+/* i386/elf relocations */
-+ BFD_RELOC_386_GOT32,
-+ BFD_RELOC_386_PLT32,
-+ BFD_RELOC_386_COPY,
-+ BFD_RELOC_386_GLOB_DAT,
-+ BFD_RELOC_386_JUMP_SLOT,
-+ BFD_RELOC_386_RELATIVE,
-+ BFD_RELOC_386_GOTOFF,
-+ BFD_RELOC_386_GOTPC,
-+ BFD_RELOC_386_TLS_TPOFF,
-+ BFD_RELOC_386_TLS_IE,
-+ BFD_RELOC_386_TLS_GOTIE,
-+ BFD_RELOC_386_TLS_LE,
-+ BFD_RELOC_386_TLS_GD,
-+ BFD_RELOC_386_TLS_LDM,
-+ BFD_RELOC_386_TLS_LDO_32,
-+ BFD_RELOC_386_TLS_IE_32,
-+ BFD_RELOC_386_TLS_LE_32,
-+ BFD_RELOC_386_TLS_DTPMOD32,
-+ BFD_RELOC_386_TLS_DTPOFF32,
-+ BFD_RELOC_386_TLS_TPOFF32,
-+ BFD_RELOC_386_TLS_GOTDESC,
-+ BFD_RELOC_386_TLS_DESC_CALL,
-+ BFD_RELOC_386_TLS_DESC,
-+
-+/* x86-64/elf relocations */
-+ BFD_RELOC_X86_64_GOT32,
-+ BFD_RELOC_X86_64_PLT32,
-+ BFD_RELOC_X86_64_COPY,
-+ BFD_RELOC_X86_64_GLOB_DAT,
-+ BFD_RELOC_X86_64_JUMP_SLOT,
-+ BFD_RELOC_X86_64_RELATIVE,
-+ BFD_RELOC_X86_64_GOTPCREL,
-+ BFD_RELOC_X86_64_32S,
-+ BFD_RELOC_X86_64_DTPMOD64,
-+ BFD_RELOC_X86_64_DTPOFF64,
-+ BFD_RELOC_X86_64_TPOFF64,
-+ BFD_RELOC_X86_64_TLSGD,
-+ BFD_RELOC_X86_64_TLSLD,
-+ BFD_RELOC_X86_64_DTPOFF32,
-+ BFD_RELOC_X86_64_GOTTPOFF,
-+ BFD_RELOC_X86_64_TPOFF32,
-+ BFD_RELOC_X86_64_GOTOFF64,
-+ BFD_RELOC_X86_64_GOTPC32,
-+ BFD_RELOC_X86_64_GOT64,
-+ BFD_RELOC_X86_64_GOTPCREL64,
-+ BFD_RELOC_X86_64_GOTPC64,
-+ BFD_RELOC_X86_64_GOTPLT64,
-+ BFD_RELOC_X86_64_PLTOFF64,
-+ BFD_RELOC_X86_64_GOTPC32_TLSDESC,
-+ BFD_RELOC_X86_64_TLSDESC_CALL,
-+ BFD_RELOC_X86_64_TLSDESC,
-+
-+/* ns32k relocations */
-+ BFD_RELOC_NS32K_IMM_8,
-+ BFD_RELOC_NS32K_IMM_16,
-+ BFD_RELOC_NS32K_IMM_32,
-+ BFD_RELOC_NS32K_IMM_8_PCREL,
-+ BFD_RELOC_NS32K_IMM_16_PCREL,
-+ BFD_RELOC_NS32K_IMM_32_PCREL,
-+ BFD_RELOC_NS32K_DISP_8,
-+ BFD_RELOC_NS32K_DISP_16,
-+ BFD_RELOC_NS32K_DISP_32,
-+ BFD_RELOC_NS32K_DISP_8_PCREL,
-+ BFD_RELOC_NS32K_DISP_16_PCREL,
-+ BFD_RELOC_NS32K_DISP_32_PCREL,
-+
-+/* PDP11 relocations */
-+ BFD_RELOC_PDP11_DISP_8_PCREL,
-+ BFD_RELOC_PDP11_DISP_6_PCREL,
-+
-+/* Picojava relocs. Not all of these appear in object files. */
-+ BFD_RELOC_PJ_CODE_HI16,
-+ BFD_RELOC_PJ_CODE_LO16,
-+ BFD_RELOC_PJ_CODE_DIR16,
-+ BFD_RELOC_PJ_CODE_DIR32,
-+ BFD_RELOC_PJ_CODE_REL16,
-+ BFD_RELOC_PJ_CODE_REL32,
-+
-+/* Power(rs6000) and PowerPC relocations. */
-+ BFD_RELOC_PPC_B26,
-+ BFD_RELOC_PPC_BA26,
-+ BFD_RELOC_PPC_TOC16,
-+ BFD_RELOC_PPC_B16,
-+ BFD_RELOC_PPC_B16_BRTAKEN,
-+ BFD_RELOC_PPC_B16_BRNTAKEN,
-+ BFD_RELOC_PPC_BA16,
-+ BFD_RELOC_PPC_BA16_BRTAKEN,
-+ BFD_RELOC_PPC_BA16_BRNTAKEN,
-+ BFD_RELOC_PPC_COPY,
-+ BFD_RELOC_PPC_GLOB_DAT,
-+ BFD_RELOC_PPC_JMP_SLOT,
-+ BFD_RELOC_PPC_RELATIVE,
-+ BFD_RELOC_PPC_LOCAL24PC,
-+ BFD_RELOC_PPC_EMB_NADDR32,
-+ BFD_RELOC_PPC_EMB_NADDR16,
-+ BFD_RELOC_PPC_EMB_NADDR16_LO,
-+ BFD_RELOC_PPC_EMB_NADDR16_HI,
-+ BFD_RELOC_PPC_EMB_NADDR16_HA,
-+ BFD_RELOC_PPC_EMB_SDAI16,
-+ BFD_RELOC_PPC_EMB_SDA2I16,
-+ BFD_RELOC_PPC_EMB_SDA2REL,
-+ BFD_RELOC_PPC_EMB_SDA21,
-+ BFD_RELOC_PPC_EMB_MRKREF,
-+ BFD_RELOC_PPC_EMB_RELSEC16,
-+ BFD_RELOC_PPC_EMB_RELST_LO,
-+ BFD_RELOC_PPC_EMB_RELST_HI,
-+ BFD_RELOC_PPC_EMB_RELST_HA,
-+ BFD_RELOC_PPC_EMB_BIT_FLD,
-+ BFD_RELOC_PPC_EMB_RELSDA,
-+ BFD_RELOC_PPC64_HIGHER,
-+ BFD_RELOC_PPC64_HIGHER_S,
-+ BFD_RELOC_PPC64_HIGHEST,
-+ BFD_RELOC_PPC64_HIGHEST_S,
-+ BFD_RELOC_PPC64_TOC16_LO,
-+ BFD_RELOC_PPC64_TOC16_HI,
-+ BFD_RELOC_PPC64_TOC16_HA,
-+ BFD_RELOC_PPC64_TOC,
-+ BFD_RELOC_PPC64_PLTGOT16,
-+ BFD_RELOC_PPC64_PLTGOT16_LO,
-+ BFD_RELOC_PPC64_PLTGOT16_HI,
-+ BFD_RELOC_PPC64_PLTGOT16_HA,
-+ BFD_RELOC_PPC64_ADDR16_DS,
-+ BFD_RELOC_PPC64_ADDR16_LO_DS,
-+ BFD_RELOC_PPC64_GOT16_DS,
-+ BFD_RELOC_PPC64_GOT16_LO_DS,
-+ BFD_RELOC_PPC64_PLT16_LO_DS,
-+ BFD_RELOC_PPC64_SECTOFF_DS,
-+ BFD_RELOC_PPC64_SECTOFF_LO_DS,
-+ BFD_RELOC_PPC64_TOC16_DS,
-+ BFD_RELOC_PPC64_TOC16_LO_DS,
-+ BFD_RELOC_PPC64_PLTGOT16_DS,
-+ BFD_RELOC_PPC64_PLTGOT16_LO_DS,
-+
-+/* PowerPC and PowerPC64 thread-local storage relocations. */
-+ BFD_RELOC_PPC_TLS,
-+ BFD_RELOC_PPC_DTPMOD,
-+ BFD_RELOC_PPC_TPREL16,
-+ BFD_RELOC_PPC_TPREL16_LO,
-+ BFD_RELOC_PPC_TPREL16_HI,
-+ BFD_RELOC_PPC_TPREL16_HA,
-+ BFD_RELOC_PPC_TPREL,
-+ BFD_RELOC_PPC_DTPREL16,
-+ BFD_RELOC_PPC_DTPREL16_LO,
-+ BFD_RELOC_PPC_DTPREL16_HI,
-+ BFD_RELOC_PPC_DTPREL16_HA,
-+ BFD_RELOC_PPC_DTPREL,
-+ BFD_RELOC_PPC_GOT_TLSGD16,
-+ BFD_RELOC_PPC_GOT_TLSGD16_LO,
-+ BFD_RELOC_PPC_GOT_TLSGD16_HI,
-+ BFD_RELOC_PPC_GOT_TLSGD16_HA,
-+ BFD_RELOC_PPC_GOT_TLSLD16,
-+ BFD_RELOC_PPC_GOT_TLSLD16_LO,
-+ BFD_RELOC_PPC_GOT_TLSLD16_HI,
-+ BFD_RELOC_PPC_GOT_TLSLD16_HA,
-+ BFD_RELOC_PPC_GOT_TPREL16,
-+ BFD_RELOC_PPC_GOT_TPREL16_LO,
-+ BFD_RELOC_PPC_GOT_TPREL16_HI,
-+ BFD_RELOC_PPC_GOT_TPREL16_HA,
-+ BFD_RELOC_PPC_GOT_DTPREL16,
-+ BFD_RELOC_PPC_GOT_DTPREL16_LO,
-+ BFD_RELOC_PPC_GOT_DTPREL16_HI,
-+ BFD_RELOC_PPC_GOT_DTPREL16_HA,
-+ BFD_RELOC_PPC64_TPREL16_DS,
-+ BFD_RELOC_PPC64_TPREL16_LO_DS,
-+ BFD_RELOC_PPC64_TPREL16_HIGHER,
-+ BFD_RELOC_PPC64_TPREL16_HIGHERA,
-+ BFD_RELOC_PPC64_TPREL16_HIGHEST,
-+ BFD_RELOC_PPC64_TPREL16_HIGHESTA,
-+ BFD_RELOC_PPC64_DTPREL16_DS,
-+ BFD_RELOC_PPC64_DTPREL16_LO_DS,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHER,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHERA,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHEST,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHESTA,
-+
-+/* IBM 370/390 relocations */
-+ BFD_RELOC_I370_D12,
-+
-+/* The type of reloc used to build a constructor table - at the moment
-+probably a 32 bit wide absolute relocation, but the target can choose.
-+It generally does map to one of the other relocation types. */
-+ BFD_RELOC_CTOR,
-+
-+/* ARM 26 bit pc-relative branch. The lowest two bits must be zero and are
-+not stored in the instruction. */
-+ BFD_RELOC_ARM_PCREL_BRANCH,
-+
-+/* ARM 26 bit pc-relative branch. The lowest bit must be zero and is
-+not stored in the instruction. The 2nd lowest bit comes from a 1 bit
-+field in the instruction. */
-+ BFD_RELOC_ARM_PCREL_BLX,
-+
-+/* Thumb 22 bit pc-relative branch. The lowest bit must be zero and is
-+not stored in the instruction. The 2nd lowest bit comes from a 1 bit
-+field in the instruction. */
-+ BFD_RELOC_THUMB_PCREL_BLX,
-+
-+/* ARM 26-bit pc-relative branch for an unconditional BL or BLX instruction. */
-+ BFD_RELOC_ARM_PCREL_CALL,
-+
-+/* ARM 26-bit pc-relative branch for B or conditional BL instruction. */
-+ BFD_RELOC_ARM_PCREL_JUMP,
-+
-+/* Thumb 7-, 9-, 12-, 20-, 23-, and 25-bit pc-relative branches.
-+The lowest bit must be zero and is not stored in the instruction.
-+Note that the corresponding ELF R_ARM_THM_JUMPnn constant has an
-+"nn" one smaller in all cases. Note further that BRANCH23
-+corresponds to R_ARM_THM_CALL. */
-+ BFD_RELOC_THUMB_PCREL_BRANCH7,
-+ BFD_RELOC_THUMB_PCREL_BRANCH9,
-+ BFD_RELOC_THUMB_PCREL_BRANCH12,
-+ BFD_RELOC_THUMB_PCREL_BRANCH20,
-+ BFD_RELOC_THUMB_PCREL_BRANCH23,
-+ BFD_RELOC_THUMB_PCREL_BRANCH25,
-+
-+/* 12-bit immediate offset, used in ARM-format ldr and str instructions. */
-+ BFD_RELOC_ARM_OFFSET_IMM,
-+
-+/* 5-bit immediate offset, used in Thumb-format ldr and str instructions. */
-+ BFD_RELOC_ARM_THUMB_OFFSET,
-+
-+/* Pc-relative or absolute relocation depending on target. Used for
-+entries in .init_array sections. */
-+ BFD_RELOC_ARM_TARGET1,
-+
-+/* Read-only segment base relative address. */
-+ BFD_RELOC_ARM_ROSEGREL32,
-+
-+/* Data segment base relative address. */
-+ BFD_RELOC_ARM_SBREL32,
-+
-+/* This reloc is used for references to RTTI data from exception handling
-+tables. The actual definition depends on the target. It may be a
-+pc-relative or some form of GOT-indirect relocation. */
-+ BFD_RELOC_ARM_TARGET2,
-+
-+/* 31-bit PC relative address. */
-+ BFD_RELOC_ARM_PREL31,
-+
-+/* Low and High halfword relocations for MOVW and MOVT instructions. */
-+ BFD_RELOC_ARM_MOVW,
-+ BFD_RELOC_ARM_MOVT,
-+ BFD_RELOC_ARM_MOVW_PCREL,
-+ BFD_RELOC_ARM_MOVT_PCREL,
-+ BFD_RELOC_ARM_THUMB_MOVW,
-+ BFD_RELOC_ARM_THUMB_MOVT,
-+ BFD_RELOC_ARM_THUMB_MOVW_PCREL,
-+ BFD_RELOC_ARM_THUMB_MOVT_PCREL,
-+
-+/* Relocations for setting up GOTs and PLTs for shared libraries. */
-+ BFD_RELOC_ARM_JUMP_SLOT,
-+ BFD_RELOC_ARM_GLOB_DAT,
-+ BFD_RELOC_ARM_GOT32,
-+ BFD_RELOC_ARM_PLT32,
-+ BFD_RELOC_ARM_RELATIVE,
-+ BFD_RELOC_ARM_GOTOFF,
-+ BFD_RELOC_ARM_GOTPC,
-+
-+/* ARM thread-local storage relocations. */
-+ BFD_RELOC_ARM_TLS_GD32,
-+ BFD_RELOC_ARM_TLS_LDO32,
-+ BFD_RELOC_ARM_TLS_LDM32,
-+ BFD_RELOC_ARM_TLS_DTPOFF32,
-+ BFD_RELOC_ARM_TLS_DTPMOD32,
-+ BFD_RELOC_ARM_TLS_TPOFF32,
-+ BFD_RELOC_ARM_TLS_IE32,
-+ BFD_RELOC_ARM_TLS_LE32,
-+
-+/* ARM group relocations. */
-+ BFD_RELOC_ARM_ALU_PC_G0_NC,
-+ BFD_RELOC_ARM_ALU_PC_G0,
-+ BFD_RELOC_ARM_ALU_PC_G1_NC,
-+ BFD_RELOC_ARM_ALU_PC_G1,
-+ BFD_RELOC_ARM_ALU_PC_G2,
-+ BFD_RELOC_ARM_LDR_PC_G0,
-+ BFD_RELOC_ARM_LDR_PC_G1,
-+ BFD_RELOC_ARM_LDR_PC_G2,
-+ BFD_RELOC_ARM_LDRS_PC_G0,
-+ BFD_RELOC_ARM_LDRS_PC_G1,
-+ BFD_RELOC_ARM_LDRS_PC_G2,
-+ BFD_RELOC_ARM_LDC_PC_G0,
-+ BFD_RELOC_ARM_LDC_PC_G1,
-+ BFD_RELOC_ARM_LDC_PC_G2,
-+ BFD_RELOC_ARM_ALU_SB_G0_NC,
-+ BFD_RELOC_ARM_ALU_SB_G0,
-+ BFD_RELOC_ARM_ALU_SB_G1_NC,
-+ BFD_RELOC_ARM_ALU_SB_G1,
-+ BFD_RELOC_ARM_ALU_SB_G2,
-+ BFD_RELOC_ARM_LDR_SB_G0,
-+ BFD_RELOC_ARM_LDR_SB_G1,
-+ BFD_RELOC_ARM_LDR_SB_G2,
-+ BFD_RELOC_ARM_LDRS_SB_G0,
-+ BFD_RELOC_ARM_LDRS_SB_G1,
-+ BFD_RELOC_ARM_LDRS_SB_G2,
-+ BFD_RELOC_ARM_LDC_SB_G0,
-+ BFD_RELOC_ARM_LDC_SB_G1,
-+ BFD_RELOC_ARM_LDC_SB_G2,
-+
-+/* These relocs are only used within the ARM assembler. They are not
-+(at present) written to any object files. */
-+ BFD_RELOC_ARM_IMMEDIATE,
-+ BFD_RELOC_ARM_ADRL_IMMEDIATE,
-+ BFD_RELOC_ARM_T32_IMMEDIATE,
-+ BFD_RELOC_ARM_T32_ADD_IMM,
-+ BFD_RELOC_ARM_T32_IMM12,
-+ BFD_RELOC_ARM_T32_ADD_PC12,
-+ BFD_RELOC_ARM_SHIFT_IMM,
-+ BFD_RELOC_ARM_SMC,
-+ BFD_RELOC_ARM_SWI,
-+ BFD_RELOC_ARM_MULTI,
-+ BFD_RELOC_ARM_CP_OFF_IMM,
-+ BFD_RELOC_ARM_CP_OFF_IMM_S2,
-+ BFD_RELOC_ARM_T32_CP_OFF_IMM,
-+ BFD_RELOC_ARM_T32_CP_OFF_IMM_S2,
-+ BFD_RELOC_ARM_ADR_IMM,
-+ BFD_RELOC_ARM_LDR_IMM,
-+ BFD_RELOC_ARM_LITERAL,
-+ BFD_RELOC_ARM_IN_POOL,
-+ BFD_RELOC_ARM_OFFSET_IMM8,
-+ BFD_RELOC_ARM_T32_OFFSET_U8,
-+ BFD_RELOC_ARM_T32_OFFSET_IMM,
-+ BFD_RELOC_ARM_HWLITERAL,
-+ BFD_RELOC_ARM_THUMB_ADD,
-+ BFD_RELOC_ARM_THUMB_IMM,
-+ BFD_RELOC_ARM_THUMB_SHIFT,
-+
-+/* Renesas / SuperH SH relocs. Not all of these appear in object files. */
-+ BFD_RELOC_SH_PCDISP8BY2,
-+ BFD_RELOC_SH_PCDISP12BY2,
-+ BFD_RELOC_SH_IMM3,
-+ BFD_RELOC_SH_IMM3U,
-+ BFD_RELOC_SH_DISP12,
-+ BFD_RELOC_SH_DISP12BY2,
-+ BFD_RELOC_SH_DISP12BY4,
-+ BFD_RELOC_SH_DISP12BY8,
-+ BFD_RELOC_SH_DISP20,
-+ BFD_RELOC_SH_DISP20BY8,
-+ BFD_RELOC_SH_IMM4,
-+ BFD_RELOC_SH_IMM4BY2,
-+ BFD_RELOC_SH_IMM4BY4,
-+ BFD_RELOC_SH_IMM8,
-+ BFD_RELOC_SH_IMM8BY2,
-+ BFD_RELOC_SH_IMM8BY4,
-+ BFD_RELOC_SH_PCRELIMM8BY2,
-+ BFD_RELOC_SH_PCRELIMM8BY4,
-+ BFD_RELOC_SH_SWITCH16,
-+ BFD_RELOC_SH_SWITCH32,
-+ BFD_RELOC_SH_USES,
-+ BFD_RELOC_SH_COUNT,
-+ BFD_RELOC_SH_ALIGN,
-+ BFD_RELOC_SH_CODE,
-+ BFD_RELOC_SH_DATA,
-+ BFD_RELOC_SH_LABEL,
-+ BFD_RELOC_SH_LOOP_START,
-+ BFD_RELOC_SH_LOOP_END,
-+ BFD_RELOC_SH_COPY,
-+ BFD_RELOC_SH_GLOB_DAT,
-+ BFD_RELOC_SH_JMP_SLOT,
-+ BFD_RELOC_SH_RELATIVE,
-+ BFD_RELOC_SH_GOTPC,
-+ BFD_RELOC_SH_GOT_LOW16,
-+ BFD_RELOC_SH_GOT_MEDLOW16,
-+ BFD_RELOC_SH_GOT_MEDHI16,
-+ BFD_RELOC_SH_GOT_HI16,
-+ BFD_RELOC_SH_GOTPLT_LOW16,
-+ BFD_RELOC_SH_GOTPLT_MEDLOW16,
-+ BFD_RELOC_SH_GOTPLT_MEDHI16,
-+ BFD_RELOC_SH_GOTPLT_HI16,
-+ BFD_RELOC_SH_PLT_LOW16,
-+ BFD_RELOC_SH_PLT_MEDLOW16,
-+ BFD_RELOC_SH_PLT_MEDHI16,
-+ BFD_RELOC_SH_PLT_HI16,
-+ BFD_RELOC_SH_GOTOFF_LOW16,
-+ BFD_RELOC_SH_GOTOFF_MEDLOW16,
-+ BFD_RELOC_SH_GOTOFF_MEDHI16,
-+ BFD_RELOC_SH_GOTOFF_HI16,
-+ BFD_RELOC_SH_GOTPC_LOW16,
-+ BFD_RELOC_SH_GOTPC_MEDLOW16,
-+ BFD_RELOC_SH_GOTPC_MEDHI16,
-+ BFD_RELOC_SH_GOTPC_HI16,
-+ BFD_RELOC_SH_COPY64,
-+ BFD_RELOC_SH_GLOB_DAT64,
-+ BFD_RELOC_SH_JMP_SLOT64,
-+ BFD_RELOC_SH_RELATIVE64,
-+ BFD_RELOC_SH_GOT10BY4,
-+ BFD_RELOC_SH_GOT10BY8,
-+ BFD_RELOC_SH_GOTPLT10BY4,
-+ BFD_RELOC_SH_GOTPLT10BY8,
-+ BFD_RELOC_SH_GOTPLT32,
-+ BFD_RELOC_SH_SHMEDIA_CODE,
-+ BFD_RELOC_SH_IMMU5,
-+ BFD_RELOC_SH_IMMS6,
-+ BFD_RELOC_SH_IMMS6BY32,
-+ BFD_RELOC_SH_IMMU6,
-+ BFD_RELOC_SH_IMMS10,
-+ BFD_RELOC_SH_IMMS10BY2,
-+ BFD_RELOC_SH_IMMS10BY4,
-+ BFD_RELOC_SH_IMMS10BY8,
-+ BFD_RELOC_SH_IMMS16,
-+ BFD_RELOC_SH_IMMU16,
-+ BFD_RELOC_SH_IMM_LOW16,
-+ BFD_RELOC_SH_IMM_LOW16_PCREL,
-+ BFD_RELOC_SH_IMM_MEDLOW16,
-+ BFD_RELOC_SH_IMM_MEDLOW16_PCREL,
-+ BFD_RELOC_SH_IMM_MEDHI16,
-+ BFD_RELOC_SH_IMM_MEDHI16_PCREL,
-+ BFD_RELOC_SH_IMM_HI16,
-+ BFD_RELOC_SH_IMM_HI16_PCREL,
-+ BFD_RELOC_SH_PT_16,
-+ BFD_RELOC_SH_TLS_GD_32,
-+ BFD_RELOC_SH_TLS_LD_32,
-+ BFD_RELOC_SH_TLS_LDO_32,
-+ BFD_RELOC_SH_TLS_IE_32,
-+ BFD_RELOC_SH_TLS_LE_32,
-+ BFD_RELOC_SH_TLS_DTPMOD32,
-+ BFD_RELOC_SH_TLS_DTPOFF32,
-+ BFD_RELOC_SH_TLS_TPOFF32,
-+
-+/* ARC Cores relocs.
-+ARC 22 bit pc-relative branch. The lowest two bits must be zero and are
-+not stored in the instruction. The high 20 bits are installed in bits 26
-+through 7 of the instruction. */
-+ BFD_RELOC_ARC_B22_PCREL,
-+
-+/* ARC 26 bit absolute branch. The lowest two bits must be zero and are not
-+stored in the instruction. The high 24 bits are installed in bits 23
-+through 0. */
-+ BFD_RELOC_ARC_B26,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc. */
-+ BFD_RELOC_BFIN_16_IMM,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc higher 16 bits. */
-+ BFD_RELOC_BFIN_16_HIGH,
-+
-+/* ADI Blackfin 'a' part of LSETUP. */
-+ BFD_RELOC_BFIN_4_PCREL,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_5_PCREL,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc lower 16 bits. */
-+ BFD_RELOC_BFIN_16_LOW,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_10_PCREL,
-+
-+/* ADI Blackfin 'b' part of LSETUP. */
-+ BFD_RELOC_BFIN_11_PCREL,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_12_PCREL_JUMP,
-+
-+/* ADI Blackfin Short jump, pcrel. */
-+ BFD_RELOC_BFIN_12_PCREL_JUMP_S,
-+
-+/* ADI Blackfin Call.x not implemented. */
-+ BFD_RELOC_BFIN_24_PCREL_CALL_X,
-+
-+/* ADI Blackfin Long Jump pcrel. */
-+ BFD_RELOC_BFIN_24_PCREL_JUMP_L,
-+
-+/* ADI Blackfin FD-PIC relocations. */
-+ BFD_RELOC_BFIN_GOT17M4,
-+ BFD_RELOC_BFIN_GOTHI,
-+ BFD_RELOC_BFIN_GOTLO,
-+ BFD_RELOC_BFIN_FUNCDESC,
-+ BFD_RELOC_BFIN_FUNCDESC_GOT17M4,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTHI,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTLO,
-+ BFD_RELOC_BFIN_FUNCDESC_VALUE,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO,
-+ BFD_RELOC_BFIN_GOTOFF17M4,
-+ BFD_RELOC_BFIN_GOTOFFHI,
-+ BFD_RELOC_BFIN_GOTOFFLO,
-+
-+/* ADI Blackfin GOT relocation. */
-+ BFD_RELOC_BFIN_GOT,
-+
-+/* ADI Blackfin PLTPC relocation. */
-+ BFD_RELOC_BFIN_PLTPC,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_PUSH,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_CONST,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_ADD,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_SUB,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_MULT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_DIV,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_MOD,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LSHIFT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_RSHIFT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_AND,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_OR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_XOR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LAND,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LOR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LEN,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_NEG,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_COMP,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_PAGE,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_HWPAGE,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_ADDR,
-+
-+/* Mitsubishi D10V relocs.
-+This is a 10-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_10_PCREL_R,
-+
-+/* Mitsubishi D10V relocs.
-+This is a 10-bit reloc with the right 2 bits
-+assumed to be 0. This is the same as the previous reloc
-+except it is in the left container, i.e.,
-+shifted left 15 bits. */
-+ BFD_RELOC_D10V_10_PCREL_L,
-+
-+/* This is an 18-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_18,
-+
-+/* This is an 18-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_18_PCREL,
-+
-+/* Mitsubishi D30V relocs.
-+This is a 6-bit absolute reloc. */
-+ BFD_RELOC_D30V_6,
-+
-+/* This is a 6-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_9_PCREL,
-+
-+/* This is a 6-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_9_PCREL_R,
-+
-+/* This is a 12-bit absolute reloc with the
-+right 3 bitsassumed to be 0. */
-+ BFD_RELOC_D30V_15,
-+
-+/* This is a 12-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_15_PCREL,
-+
-+/* This is a 12-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_15_PCREL_R,
-+
-+/* This is an 18-bit absolute reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_21,
-+
-+/* This is an 18-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_21_PCREL,
-+
-+/* This is an 18-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_21_PCREL_R,
-+
-+/* This is a 32-bit absolute reloc. */
-+ BFD_RELOC_D30V_32,
-+
-+/* This is a 32-bit pc-relative reloc. */
-+ BFD_RELOC_D30V_32_PCREL,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_HI16_S,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_LO16,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_JMP26,
-+
-+/* Renesas M16C/M32C Relocations. */
-+ BFD_RELOC_M32C_HI8,
-+ BFD_RELOC_M32C_RL_JUMP,
-+ BFD_RELOC_M32C_RL_1ADDR,
-+ BFD_RELOC_M32C_RL_2ADDR,
-+
-+/* Renesas M32R (formerly Mitsubishi M32R) relocs.
-+This is a 24 bit absolute address. */
-+ BFD_RELOC_M32R_24,
-+
-+/* This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_10_PCREL,
-+
-+/* This is an 18-bit reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_18_PCREL,
-+
-+/* This is a 26-bit reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_26_PCREL,
-+
-+/* This is a 16-bit reloc containing the high 16 bits of an address
-+used when the lower 16 bits are treated as unsigned. */
-+ BFD_RELOC_M32R_HI16_ULO,
-+
-+/* This is a 16-bit reloc containing the high 16 bits of an address
-+used when the lower 16 bits are treated as signed. */
-+ BFD_RELOC_M32R_HI16_SLO,
-+
-+/* This is a 16-bit reloc containing the lower 16 bits of an address. */
-+ BFD_RELOC_M32R_LO16,
-+
-+/* This is a 16-bit reloc containing the small data area offset for use in
-+add3, load, and store instructions. */
-+ BFD_RELOC_M32R_SDA16,
-+
-+/* For PIC. */
-+ BFD_RELOC_M32R_GOT24,
-+ BFD_RELOC_M32R_26_PLTREL,
-+ BFD_RELOC_M32R_COPY,
-+ BFD_RELOC_M32R_GLOB_DAT,
-+ BFD_RELOC_M32R_JMP_SLOT,
-+ BFD_RELOC_M32R_RELATIVE,
-+ BFD_RELOC_M32R_GOTOFF,
-+ BFD_RELOC_M32R_GOTOFF_HI_ULO,
-+ BFD_RELOC_M32R_GOTOFF_HI_SLO,
-+ BFD_RELOC_M32R_GOTOFF_LO,
-+ BFD_RELOC_M32R_GOTPC24,
-+ BFD_RELOC_M32R_GOT16_HI_ULO,
-+ BFD_RELOC_M32R_GOT16_HI_SLO,
-+ BFD_RELOC_M32R_GOT16_LO,
-+ BFD_RELOC_M32R_GOTPC_HI_ULO,
-+ BFD_RELOC_M32R_GOTPC_HI_SLO,
-+ BFD_RELOC_M32R_GOTPC_LO,
-+
-+/* This is a 9-bit reloc */
-+ BFD_RELOC_V850_9_PCREL,
-+
-+/* This is a 22-bit reloc */
-+ BFD_RELOC_V850_22_PCREL,
-+
-+/* This is a 16 bit offset from the short data area pointer. */
-+ BFD_RELOC_V850_SDA_16_16_OFFSET,
-+
-+/* This is a 16 bit offset (of which only 15 bits are used) from the
-+short data area pointer. */
-+ BFD_RELOC_V850_SDA_15_16_OFFSET,
-+
-+/* This is a 16 bit offset from the zero data area pointer. */
-+ BFD_RELOC_V850_ZDA_16_16_OFFSET,
-+
-+/* This is a 16 bit offset (of which only 15 bits are used) from the
-+zero data area pointer. */
-+ BFD_RELOC_V850_ZDA_15_16_OFFSET,
-+
-+/* This is an 8 bit offset (of which only 6 bits are used) from the
-+tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_6_8_OFFSET,
-+
-+/* This is an 8bit offset (of which only 7 bits are used) from the tiny
-+data area pointer. */
-+ BFD_RELOC_V850_TDA_7_8_OFFSET,
-+
-+/* This is a 7 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_7_7_OFFSET,
-+
-+/* This is a 16 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_16_16_OFFSET,
-+
-+/* This is a 5 bit offset (of which only 4 bits are used) from the tiny
-+data area pointer. */
-+ BFD_RELOC_V850_TDA_4_5_OFFSET,
-+
-+/* This is a 4 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_4_4_OFFSET,
-+
-+/* This is a 16 bit offset from the short data area pointer, with the
-+bits placed non-contiguously in the instruction. */
-+ BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET,
-+
-+/* This is a 16 bit offset from the zero data area pointer, with the
-+bits placed non-contiguously in the instruction. */
-+ BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET,
-+
-+/* This is a 6 bit offset from the call table base pointer. */
-+ BFD_RELOC_V850_CALLT_6_7_OFFSET,
-+
-+/* This is a 16 bit offset from the call table base pointer. */
-+ BFD_RELOC_V850_CALLT_16_16_OFFSET,
-+
-+/* Used for relaxing indirect function calls. */
-+ BFD_RELOC_V850_LONGCALL,
-+
-+/* Used for relaxing indirect jumps. */
-+ BFD_RELOC_V850_LONGJUMP,
-+
-+/* Used to maintain alignment whilst relaxing. */
-+ BFD_RELOC_V850_ALIGN,
-+
-+/* This is a variation of BFD_RELOC_LO16 that can be used in v850e ld.bu
-+instructions. */
-+ BFD_RELOC_V850_LO16_SPLIT_OFFSET,
-+
-+/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-+instruction. */
-+ BFD_RELOC_MN10300_32_PCREL,
-+
-+/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-+instruction. */
-+ BFD_RELOC_MN10300_16_PCREL,
-+
-+/* This is a 8bit DP reloc for the tms320c30, where the most
-+significant 8 bits of a 24 bit word are placed into the least
-+significant 8 bits of the opcode. */
-+ BFD_RELOC_TIC30_LDP,
-+
-+/* This is a 7bit reloc for the tms320c54x, where the least
-+significant 7 bits of a 16 bit word are placed into the least
-+significant 7 bits of the opcode. */
-+ BFD_RELOC_TIC54X_PARTLS7,
-+
-+/* This is a 9bit DP reloc for the tms320c54x, where the most
-+significant 9 bits of a 16 bit word are placed into the least
-+significant 9 bits of the opcode. */
-+ BFD_RELOC_TIC54X_PARTMS9,
-+
-+/* This is an extended address 23-bit reloc for the tms320c54x. */
-+ BFD_RELOC_TIC54X_23,
-+
-+/* This is a 16-bit reloc for the tms320c54x, where the least
-+significant 16 bits of a 23-bit extended address are placed into
-+the opcode. */
-+ BFD_RELOC_TIC54X_16_OF_23,
-+
-+/* This is a reloc for the tms320c54x, where the most
-+significant 7 bits of a 23-bit extended address are placed into
-+the opcode. */
-+ BFD_RELOC_TIC54X_MS7_OF_23,
-+
-+/* This is a 48 bit reloc for the FR30 that stores 32 bits. */
-+ BFD_RELOC_FR30_48,
-+
-+/* This is a 32 bit reloc for the FR30 that stores 20 bits split up into
-+two sections. */
-+ BFD_RELOC_FR30_20,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
-+4 bits. */
-+ BFD_RELOC_FR30_6_IN_4,
-+
-+/* This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_8_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_9_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_10_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
-+short offset into 8 bits. */
-+ BFD_RELOC_FR30_9_PCREL,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
-+short offset into 11 bits. */
-+ BFD_RELOC_FR30_12_PCREL,
-+
-+/* Motorola Mcore relocations. */
-+ BFD_RELOC_MCORE_PCREL_IMM8BY4,
-+ BFD_RELOC_MCORE_PCREL_IMM11BY2,
-+ BFD_RELOC_MCORE_PCREL_IMM4BY2,
-+ BFD_RELOC_MCORE_PCREL_32,
-+ BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2,
-+ BFD_RELOC_MCORE_RVA,
-+
-+/* Toshiba Media Processor Relocations. */
-+ BFD_RELOC_MEP_8,
-+ BFD_RELOC_MEP_16,
-+ BFD_RELOC_MEP_32,
-+ BFD_RELOC_MEP_PCREL8A2,
-+ BFD_RELOC_MEP_PCREL12A2,
-+ BFD_RELOC_MEP_PCREL17A2,
-+ BFD_RELOC_MEP_PCREL24A2,
-+ BFD_RELOC_MEP_PCABS24A2,
-+ BFD_RELOC_MEP_LOW16,
-+ BFD_RELOC_MEP_HI16U,
-+ BFD_RELOC_MEP_HI16S,
-+ BFD_RELOC_MEP_GPREL,
-+ BFD_RELOC_MEP_TPREL,
-+ BFD_RELOC_MEP_TPREL7,
-+ BFD_RELOC_MEP_TPREL7A2,
-+ BFD_RELOC_MEP_TPREL7A4,
-+ BFD_RELOC_MEP_UIMM24,
-+ BFD_RELOC_MEP_ADDR24A4,
-+ BFD_RELOC_MEP_GNU_VTINHERIT,
-+ BFD_RELOC_MEP_GNU_VTENTRY,
-+
-+
-+/* These are relocations for the GETA instruction. */
-+ BFD_RELOC_MMIX_GETA,
-+ BFD_RELOC_MMIX_GETA_1,
-+ BFD_RELOC_MMIX_GETA_2,
-+ BFD_RELOC_MMIX_GETA_3,
-+
-+/* These are relocations for a conditional branch instruction. */
-+ BFD_RELOC_MMIX_CBRANCH,
-+ BFD_RELOC_MMIX_CBRANCH_J,
-+ BFD_RELOC_MMIX_CBRANCH_1,
-+ BFD_RELOC_MMIX_CBRANCH_2,
-+ BFD_RELOC_MMIX_CBRANCH_3,
-+
-+/* These are relocations for the PUSHJ instruction. */
-+ BFD_RELOC_MMIX_PUSHJ,
-+ BFD_RELOC_MMIX_PUSHJ_1,
-+ BFD_RELOC_MMIX_PUSHJ_2,
-+ BFD_RELOC_MMIX_PUSHJ_3,
-+ BFD_RELOC_MMIX_PUSHJ_STUBBABLE,
-+
-+/* These are relocations for the JMP instruction. */
-+ BFD_RELOC_MMIX_JMP,
-+ BFD_RELOC_MMIX_JMP_1,
-+ BFD_RELOC_MMIX_JMP_2,
-+ BFD_RELOC_MMIX_JMP_3,
-+
-+/* This is a relocation for a relative address as in a GETA instruction or
-+a branch. */
-+ BFD_RELOC_MMIX_ADDR19,
-+
-+/* This is a relocation for a relative address as in a JMP instruction. */
-+ BFD_RELOC_MMIX_ADDR27,
-+
-+/* This is a relocation for an instruction field that may be a general
-+register or a value 0..255. */
-+ BFD_RELOC_MMIX_REG_OR_BYTE,
-+
-+/* This is a relocation for an instruction field that may be a general
-+register. */
-+ BFD_RELOC_MMIX_REG,
-+
-+/* This is a relocation for two instruction fields holding a register and
-+an offset, the equivalent of the relocation. */
-+ BFD_RELOC_MMIX_BASE_PLUS_OFFSET,
-+
-+/* This relocation is an assertion that the expression is not allocated as
-+a global register. It does not modify contents. */
-+ BFD_RELOC_MMIX_LOCAL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit pc relative
-+short offset into 7 bits. */
-+ BFD_RELOC_AVR_7_PCREL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 13 bit pc relative
-+short offset into 12 bits. */
-+ BFD_RELOC_AVR_13_PCREL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 17 bit value (usually
-+program memory address) into 16 bits. */
-+ BFD_RELOC_AVR_16_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
-+data memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_LO8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of data memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HI8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of program memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HH8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of 32 bit value) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_MS8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(usually data memory address) into 8 bit immediate value of SUBI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 8 bit of data memory address) into 8 bit immediate value of
-+SUBI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(most high 8 bit of program memory address) into 8 bit immediate value
-+of LDI or SUBI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value (msb
-+of 32 bit value) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_MS8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
-+command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value
-+(command address) into 8 bit immediate value of LDI insn. If the address
-+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
-+in the lower 128k. */
-+ BFD_RELOC_AVR_LO8_LDI_GS,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. If the address
-+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
-+below 128k. */
-+ BFD_RELOC_AVR_HI8_LDI_GS,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(usually command address) into 8 bit immediate value of SUBI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_PM_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 8 bit of 16 bit command address) into 8 bit immediate value
-+of SUBI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_PM_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 6 bit of 22 bit command address) into 8 bit immediate
-+value of SUBI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_PM_NEG,
-+
-+/* This is a 32 bit reloc for the AVR that stores 23 bit value
-+into 22 bits. */
-+ BFD_RELOC_AVR_CALL,
-+
-+/* This is a 16 bit reloc for the AVR that stores all needed bits
-+for absolute addressing with ldi with overflow check to linktime */
-+ BFD_RELOC_AVR_LDI,
-+
-+/* This is a 6 bit reloc for the AVR that stores offset for ldd/std
-+instructions */
-+ BFD_RELOC_AVR_6,
-+
-+/* This is a 6 bit reloc for the AVR that stores offset for adiw/sbiw
-+instructions */
-+ BFD_RELOC_AVR_6_ADIW,
-+
-+/* Direct 12 bit. */
-+ BFD_RELOC_390_12,
-+
-+/* 12 bit GOT offset. */
-+ BFD_RELOC_390_GOT12,
-+
-+/* 32 bit PC relative PLT address. */
-+ BFD_RELOC_390_PLT32,
-+
-+/* Copy symbol at runtime. */
-+ BFD_RELOC_390_COPY,
-+
-+/* Create GOT entry. */
-+ BFD_RELOC_390_GLOB_DAT,
-+
-+/* Create PLT entry. */
-+ BFD_RELOC_390_JMP_SLOT,
-+
-+/* Adjust by program base. */
-+ BFD_RELOC_390_RELATIVE,
-+
-+/* 32 bit PC relative offset to GOT. */
-+ BFD_RELOC_390_GOTPC,
-+
-+/* 16 bit GOT offset. */
-+ BFD_RELOC_390_GOT16,
-+
-+/* PC relative 16 bit shifted by 1. */
-+ BFD_RELOC_390_PC16DBL,
-+
-+/* 16 bit PC rel. PLT shifted by 1. */
-+ BFD_RELOC_390_PLT16DBL,
-+
-+/* PC relative 32 bit shifted by 1. */
-+ BFD_RELOC_390_PC32DBL,
-+
-+/* 32 bit PC rel. PLT shifted by 1. */
-+ BFD_RELOC_390_PLT32DBL,
-+
-+/* 32 bit PC rel. GOT shifted by 1. */
-+ BFD_RELOC_390_GOTPCDBL,
-+
-+/* 64 bit GOT offset. */
-+ BFD_RELOC_390_GOT64,
-+
-+/* 64 bit PC relative PLT address. */
-+ BFD_RELOC_390_PLT64,
-+
-+/* 32 bit rel. offset to GOT entry. */
-+ BFD_RELOC_390_GOTENT,
-+
-+/* 64 bit offset to GOT. */
-+ BFD_RELOC_390_GOTOFF64,
-+
-+/* 12-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT12,
-+
-+/* 16-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT16,
-+
-+/* 32-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT32,
-+
-+/* 64-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT64,
-+
-+/* 32-bit rel. offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLTENT,
-+
-+/* 16-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF16,
-+
-+/* 32-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF32,
-+
-+/* 64-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF64,
-+
-+/* s390 tls relocations. */
-+ BFD_RELOC_390_TLS_LOAD,
-+ BFD_RELOC_390_TLS_GDCALL,
-+ BFD_RELOC_390_TLS_LDCALL,
-+ BFD_RELOC_390_TLS_GD32,
-+ BFD_RELOC_390_TLS_GD64,
-+ BFD_RELOC_390_TLS_GOTIE12,
-+ BFD_RELOC_390_TLS_GOTIE32,
-+ BFD_RELOC_390_TLS_GOTIE64,
-+ BFD_RELOC_390_TLS_LDM32,
-+ BFD_RELOC_390_TLS_LDM64,
-+ BFD_RELOC_390_TLS_IE32,
-+ BFD_RELOC_390_TLS_IE64,
-+ BFD_RELOC_390_TLS_IEENT,
-+ BFD_RELOC_390_TLS_LE32,
-+ BFD_RELOC_390_TLS_LE64,
-+ BFD_RELOC_390_TLS_LDO32,
-+ BFD_RELOC_390_TLS_LDO64,
-+ BFD_RELOC_390_TLS_DTPMOD,
-+ BFD_RELOC_390_TLS_DTPOFF,
-+ BFD_RELOC_390_TLS_TPOFF,
-+
-+/* Long displacement extension. */
-+ BFD_RELOC_390_20,
-+ BFD_RELOC_390_GOT20,
-+ BFD_RELOC_390_GOTPLT20,
-+ BFD_RELOC_390_TLS_GOTIE20,
-+
-+/* Score relocations */
-+ BFD_RELOC_SCORE_DUMMY1,
-+
-+/* Low 16 bit for load/store */
-+ BFD_RELOC_SCORE_GPREL15,
-+
-+/* This is a 24-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE_DUMMY2,
-+ BFD_RELOC_SCORE_JMP,
-+
-+/* This is a 19-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE_BRANCH,
-+
-+/* This is a 11-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE16_JMP,
-+
-+/* This is a 8-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE16_BRANCH,
-+
-+/* Undocumented Score relocs */
-+ BFD_RELOC_SCORE_GOT15,
-+ BFD_RELOC_SCORE_GOT_LO16,
-+ BFD_RELOC_SCORE_CALL15,
-+ BFD_RELOC_SCORE_DUMMY_HI16,
-+
-+/* Scenix IP2K - 9-bit register number / data address */
-+ BFD_RELOC_IP2K_FR9,
-+
-+/* Scenix IP2K - 4-bit register/data bank number */
-+ BFD_RELOC_IP2K_BANK,
-+
-+/* Scenix IP2K - low 13 bits of instruction word address */
-+ BFD_RELOC_IP2K_ADDR16CJP,
-+
-+/* Scenix IP2K - high 3 bits of instruction word address */
-+ BFD_RELOC_IP2K_PAGE3,
-+
-+/* Scenix IP2K - ext/low/high 8 bits of data address */
-+ BFD_RELOC_IP2K_LO8DATA,
-+ BFD_RELOC_IP2K_HI8DATA,
-+ BFD_RELOC_IP2K_EX8DATA,
-+
-+/* Scenix IP2K - low/high 8 bits of instruction word address */
-+ BFD_RELOC_IP2K_LO8INSN,
-+ BFD_RELOC_IP2K_HI8INSN,
-+
-+/* Scenix IP2K - even/odd PC modifier to modify snb pcl.0 */
-+ BFD_RELOC_IP2K_PC_SKIP,
-+
-+/* Scenix IP2K - 16 bit word address in text section. */
-+ BFD_RELOC_IP2K_TEXT,
-+
-+/* Scenix IP2K - 7-bit sp or dp offset */
-+ BFD_RELOC_IP2K_FR_OFFSET,
-+
-+/* Scenix VPE4K coprocessor - data/insn-space addressing */
-+ BFD_RELOC_VPE4KMATH_DATA,
-+ BFD_RELOC_VPE4KMATH_INSN,
-+
-+/* These two relocations are used by the linker to determine which of
-+the entries in a C++ virtual function table are actually used. When
-+the --gc-sections option is given, the linker will zero out the entries
-+that are not used, so that the code for those functions need not be
-+included in the output.
-+
-+VTABLE_INHERIT is a zero-space relocation used to describe to the
-+linker the inheritance tree of a C++ virtual function table. The
-+relocation's symbol should be the parent class' vtable, and the
-+relocation should be located at the child vtable.
-+
-+VTABLE_ENTRY is a zero-space relocation that describes the use of a
-+virtual function table entry. The reloc's symbol should refer to the
-+table of the class mentioned in the code. Off of that base, an offset
-+describes the entry that is being used. For Rela hosts, this offset
-+is stored in the reloc's addend. For Rel hosts, we are forced to put
-+this offset in the reloc's section offset. */
-+ BFD_RELOC_VTABLE_INHERIT,
-+ BFD_RELOC_VTABLE_ENTRY,
-+
-+/* Intel IA64 Relocations. */
-+ BFD_RELOC_IA64_IMM14,
-+ BFD_RELOC_IA64_IMM22,
-+ BFD_RELOC_IA64_IMM64,
-+ BFD_RELOC_IA64_DIR32MSB,
-+ BFD_RELOC_IA64_DIR32LSB,
-+ BFD_RELOC_IA64_DIR64MSB,
-+ BFD_RELOC_IA64_DIR64LSB,
-+ BFD_RELOC_IA64_GPREL22,
-+ BFD_RELOC_IA64_GPREL64I,
-+ BFD_RELOC_IA64_GPREL32MSB,
-+ BFD_RELOC_IA64_GPREL32LSB,
-+ BFD_RELOC_IA64_GPREL64MSB,
-+ BFD_RELOC_IA64_GPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF22,
-+ BFD_RELOC_IA64_LTOFF64I,
-+ BFD_RELOC_IA64_PLTOFF22,
-+ BFD_RELOC_IA64_PLTOFF64I,
-+ BFD_RELOC_IA64_PLTOFF64MSB,
-+ BFD_RELOC_IA64_PLTOFF64LSB,
-+ BFD_RELOC_IA64_FPTR64I,
-+ BFD_RELOC_IA64_FPTR32MSB,
-+ BFD_RELOC_IA64_FPTR32LSB,
-+ BFD_RELOC_IA64_FPTR64MSB,
-+ BFD_RELOC_IA64_FPTR64LSB,
-+ BFD_RELOC_IA64_PCREL21B,
-+ BFD_RELOC_IA64_PCREL21BI,
-+ BFD_RELOC_IA64_PCREL21M,
-+ BFD_RELOC_IA64_PCREL21F,
-+ BFD_RELOC_IA64_PCREL22,
-+ BFD_RELOC_IA64_PCREL60B,
-+ BFD_RELOC_IA64_PCREL64I,
-+ BFD_RELOC_IA64_PCREL32MSB,
-+ BFD_RELOC_IA64_PCREL32LSB,
-+ BFD_RELOC_IA64_PCREL64MSB,
-+ BFD_RELOC_IA64_PCREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR22,
-+ BFD_RELOC_IA64_LTOFF_FPTR64I,
-+ BFD_RELOC_IA64_LTOFF_FPTR32MSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR32LSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR64MSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR64LSB,
-+ BFD_RELOC_IA64_SEGREL32MSB,
-+ BFD_RELOC_IA64_SEGREL32LSB,
-+ BFD_RELOC_IA64_SEGREL64MSB,
-+ BFD_RELOC_IA64_SEGREL64LSB,
-+ BFD_RELOC_IA64_SECREL32MSB,
-+ BFD_RELOC_IA64_SECREL32LSB,
-+ BFD_RELOC_IA64_SECREL64MSB,
-+ BFD_RELOC_IA64_SECREL64LSB,
-+ BFD_RELOC_IA64_REL32MSB,
-+ BFD_RELOC_IA64_REL32LSB,
-+ BFD_RELOC_IA64_REL64MSB,
-+ BFD_RELOC_IA64_REL64LSB,
-+ BFD_RELOC_IA64_LTV32MSB,
-+ BFD_RELOC_IA64_LTV32LSB,
-+ BFD_RELOC_IA64_LTV64MSB,
-+ BFD_RELOC_IA64_LTV64LSB,
-+ BFD_RELOC_IA64_IPLTMSB,
-+ BFD_RELOC_IA64_IPLTLSB,
-+ BFD_RELOC_IA64_COPY,
-+ BFD_RELOC_IA64_LTOFF22X,
-+ BFD_RELOC_IA64_LDXMOV,
-+ BFD_RELOC_IA64_TPREL14,
-+ BFD_RELOC_IA64_TPREL22,
-+ BFD_RELOC_IA64_TPREL64I,
-+ BFD_RELOC_IA64_TPREL64MSB,
-+ BFD_RELOC_IA64_TPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_TPREL22,
-+ BFD_RELOC_IA64_DTPMOD64MSB,
-+ BFD_RELOC_IA64_DTPMOD64LSB,
-+ BFD_RELOC_IA64_LTOFF_DTPMOD22,
-+ BFD_RELOC_IA64_DTPREL14,
-+ BFD_RELOC_IA64_DTPREL22,
-+ BFD_RELOC_IA64_DTPREL64I,
-+ BFD_RELOC_IA64_DTPREL32MSB,
-+ BFD_RELOC_IA64_DTPREL32LSB,
-+ BFD_RELOC_IA64_DTPREL64MSB,
-+ BFD_RELOC_IA64_DTPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_DTPREL22,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 8 bit high part of an absolute address. */
-+ BFD_RELOC_M68HC11_HI8,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 8 bit low part of an absolute address. */
-+ BFD_RELOC_M68HC11_LO8,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 3 bit of a value. */
-+ BFD_RELOC_M68HC11_3B,
-+
-+/* Motorola 68HC11 reloc.
-+This reloc marks the beginning of a jump/call instruction.
-+It is used for linker relaxation to correctly identify beginning
-+of instruction and change some branches to use PC-relative
-+addressing mode. */
-+ BFD_RELOC_M68HC11_RL_JUMP,
-+
-+/* Motorola 68HC11 reloc.
-+This reloc marks a group of several instructions that gcc generates
-+and for which the linker relaxation pass can modify and/or remove
-+some of them. */
-+ BFD_RELOC_M68HC11_RL_GROUP,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 16-bit lower part of an address. It is used for 'call'
-+instruction to specify the symbol address without any special
-+transformation (due to memory bank window). */
-+ BFD_RELOC_M68HC11_LO16,
-+
-+/* Motorola 68HC11 reloc.
-+This is a 8-bit reloc that specifies the page number of an address.
-+It is used by 'call' instruction to specify the page number of
-+the symbol. */
-+ BFD_RELOC_M68HC11_PAGE,
-+
-+/* Motorola 68HC11 reloc.
-+This is a 24-bit reloc that represents the address with a 16-bit
-+value and a 8-bit page number. The symbol address is transformed
-+to follow the 16K memory bank of 68HC12 (seen as mapped in the window). */
-+ BFD_RELOC_M68HC11_24,
-+
-+/* Motorola 68HC12 reloc.
-+This is the 5 bits of a value. */
-+ BFD_RELOC_M68HC12_5B,
-+
-+/* NS CR16C Relocations. */
-+ BFD_RELOC_16C_NUM08,
-+ BFD_RELOC_16C_NUM08_C,
-+ BFD_RELOC_16C_NUM16,
-+ BFD_RELOC_16C_NUM16_C,
-+ BFD_RELOC_16C_NUM32,
-+ BFD_RELOC_16C_NUM32_C,
-+ BFD_RELOC_16C_DISP04,
-+ BFD_RELOC_16C_DISP04_C,
-+ BFD_RELOC_16C_DISP08,
-+ BFD_RELOC_16C_DISP08_C,
-+ BFD_RELOC_16C_DISP16,
-+ BFD_RELOC_16C_DISP16_C,
-+ BFD_RELOC_16C_DISP24,
-+ BFD_RELOC_16C_DISP24_C,
-+ BFD_RELOC_16C_DISP24a,
-+ BFD_RELOC_16C_DISP24a_C,
-+ BFD_RELOC_16C_REG04,
-+ BFD_RELOC_16C_REG04_C,
-+ BFD_RELOC_16C_REG04a,
-+ BFD_RELOC_16C_REG04a_C,
-+ BFD_RELOC_16C_REG14,
-+ BFD_RELOC_16C_REG14_C,
-+ BFD_RELOC_16C_REG16,
-+ BFD_RELOC_16C_REG16_C,
-+ BFD_RELOC_16C_REG20,
-+ BFD_RELOC_16C_REG20_C,
-+ BFD_RELOC_16C_ABS20,
-+ BFD_RELOC_16C_ABS20_C,
-+ BFD_RELOC_16C_ABS24,
-+ BFD_RELOC_16C_ABS24_C,
-+ BFD_RELOC_16C_IMM04,
-+ BFD_RELOC_16C_IMM04_C,
-+ BFD_RELOC_16C_IMM16,
-+ BFD_RELOC_16C_IMM16_C,
-+ BFD_RELOC_16C_IMM20,
-+ BFD_RELOC_16C_IMM20_C,
-+ BFD_RELOC_16C_IMM24,
-+ BFD_RELOC_16C_IMM24_C,
-+ BFD_RELOC_16C_IMM32,
-+ BFD_RELOC_16C_IMM32_C,
-+
-+/* NS CR16 Relocations. */
-+ BFD_RELOC_CR16_NUM8,
-+ BFD_RELOC_CR16_NUM16,
-+ BFD_RELOC_CR16_NUM32,
-+ BFD_RELOC_CR16_NUM32a,
-+ BFD_RELOC_CR16_REGREL0,
-+ BFD_RELOC_CR16_REGREL4,
-+ BFD_RELOC_CR16_REGREL4a,
-+ BFD_RELOC_CR16_REGREL14,
-+ BFD_RELOC_CR16_REGREL14a,
-+ BFD_RELOC_CR16_REGREL16,
-+ BFD_RELOC_CR16_REGREL20,
-+ BFD_RELOC_CR16_REGREL20a,
-+ BFD_RELOC_CR16_ABS20,
-+ BFD_RELOC_CR16_ABS24,
-+ BFD_RELOC_CR16_IMM4,
-+ BFD_RELOC_CR16_IMM8,
-+ BFD_RELOC_CR16_IMM16,
-+ BFD_RELOC_CR16_IMM20,
-+ BFD_RELOC_CR16_IMM24,
-+ BFD_RELOC_CR16_IMM32,
-+ BFD_RELOC_CR16_IMM32a,
-+ BFD_RELOC_CR16_DISP4,
-+ BFD_RELOC_CR16_DISP8,
-+ BFD_RELOC_CR16_DISP16,
-+ BFD_RELOC_CR16_DISP20,
-+ BFD_RELOC_CR16_DISP24,
-+ BFD_RELOC_CR16_DISP24a,
-+
-+/* NS CRX Relocations. */
-+ BFD_RELOC_CRX_REL4,
-+ BFD_RELOC_CRX_REL8,
-+ BFD_RELOC_CRX_REL8_CMP,
-+ BFD_RELOC_CRX_REL16,
-+ BFD_RELOC_CRX_REL24,
-+ BFD_RELOC_CRX_REL32,
-+ BFD_RELOC_CRX_REGREL12,
-+ BFD_RELOC_CRX_REGREL22,
-+ BFD_RELOC_CRX_REGREL28,
-+ BFD_RELOC_CRX_REGREL32,
-+ BFD_RELOC_CRX_ABS16,
-+ BFD_RELOC_CRX_ABS32,
-+ BFD_RELOC_CRX_NUM8,
-+ BFD_RELOC_CRX_NUM16,
-+ BFD_RELOC_CRX_NUM32,
-+ BFD_RELOC_CRX_IMM16,
-+ BFD_RELOC_CRX_IMM32,
-+ BFD_RELOC_CRX_SWITCH8,
-+ BFD_RELOC_CRX_SWITCH16,
-+ BFD_RELOC_CRX_SWITCH32,
-+
-+/* These relocs are only used within the CRIS assembler. They are not
-+(at present) written to any object files. */
-+ BFD_RELOC_CRIS_BDISP8,
-+ BFD_RELOC_CRIS_UNSIGNED_5,
-+ BFD_RELOC_CRIS_SIGNED_6,
-+ BFD_RELOC_CRIS_UNSIGNED_6,
-+ BFD_RELOC_CRIS_SIGNED_8,
-+ BFD_RELOC_CRIS_UNSIGNED_8,
-+ BFD_RELOC_CRIS_SIGNED_16,
-+ BFD_RELOC_CRIS_UNSIGNED_16,
-+ BFD_RELOC_CRIS_LAPCQ_OFFSET,
-+ BFD_RELOC_CRIS_UNSIGNED_4,
-+
-+/* Relocs used in ELF shared libraries for CRIS. */
-+ BFD_RELOC_CRIS_COPY,
-+ BFD_RELOC_CRIS_GLOB_DAT,
-+ BFD_RELOC_CRIS_JUMP_SLOT,
-+ BFD_RELOC_CRIS_RELATIVE,
-+
-+/* 32-bit offset to symbol-entry within GOT. */
-+ BFD_RELOC_CRIS_32_GOT,
-+
-+/* 16-bit offset to symbol-entry within GOT. */
-+ BFD_RELOC_CRIS_16_GOT,
-+
-+/* 32-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_CRIS_32_GOTPLT,
-+
-+/* 16-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_CRIS_16_GOTPLT,
-+
-+/* 32-bit offset to symbol, relative to GOT. */
-+ BFD_RELOC_CRIS_32_GOTREL,
-+
-+/* 32-bit offset to symbol with PLT entry, relative to GOT. */
-+ BFD_RELOC_CRIS_32_PLT_GOTREL,
-+
-+/* 32-bit offset to symbol with PLT entry, relative to this relocation. */
-+ BFD_RELOC_CRIS_32_PLT_PCREL,
-+
-+/* Intel i860 Relocations. */
-+ BFD_RELOC_860_COPY,
-+ BFD_RELOC_860_GLOB_DAT,
-+ BFD_RELOC_860_JUMP_SLOT,
-+ BFD_RELOC_860_RELATIVE,
-+ BFD_RELOC_860_PC26,
-+ BFD_RELOC_860_PLT26,
-+ BFD_RELOC_860_PC16,
-+ BFD_RELOC_860_LOW0,
-+ BFD_RELOC_860_SPLIT0,
-+ BFD_RELOC_860_LOW1,
-+ BFD_RELOC_860_SPLIT1,
-+ BFD_RELOC_860_LOW2,
-+ BFD_RELOC_860_SPLIT2,
-+ BFD_RELOC_860_LOW3,
-+ BFD_RELOC_860_LOGOT0,
-+ BFD_RELOC_860_SPGOT0,
-+ BFD_RELOC_860_LOGOT1,
-+ BFD_RELOC_860_SPGOT1,
-+ BFD_RELOC_860_LOGOTOFF0,
-+ BFD_RELOC_860_SPGOTOFF0,
-+ BFD_RELOC_860_LOGOTOFF1,
-+ BFD_RELOC_860_SPGOTOFF1,
-+ BFD_RELOC_860_LOGOTOFF2,
-+ BFD_RELOC_860_LOGOTOFF3,
-+ BFD_RELOC_860_LOPC,
-+ BFD_RELOC_860_HIGHADJ,
-+ BFD_RELOC_860_HAGOT,
-+ BFD_RELOC_860_HAGOTOFF,
-+ BFD_RELOC_860_HAPC,
-+ BFD_RELOC_860_HIGH,
-+ BFD_RELOC_860_HIGOT,
-+ BFD_RELOC_860_HIGOTOFF,
-+
-+/* OpenRISC Relocations. */
-+ BFD_RELOC_OPENRISC_ABS_26,
-+ BFD_RELOC_OPENRISC_REL_26,
-+
-+/* H8 elf Relocations. */
-+ BFD_RELOC_H8_DIR16A8,
-+ BFD_RELOC_H8_DIR16R8,
-+ BFD_RELOC_H8_DIR24A8,
-+ BFD_RELOC_H8_DIR24R8,
-+ BFD_RELOC_H8_DIR32A16,
-+
-+/* Sony Xstormy16 Relocations. */
-+ BFD_RELOC_XSTORMY16_REL_12,
-+ BFD_RELOC_XSTORMY16_12,
-+ BFD_RELOC_XSTORMY16_24,
-+ BFD_RELOC_XSTORMY16_FPTR16,
-+
-+/* Self-describing complex relocations. */
-+ BFD_RELOC_RELC,
-+
-+
-+/* Infineon Relocations. */
-+ BFD_RELOC_XC16X_PAG,
-+ BFD_RELOC_XC16X_POF,
-+ BFD_RELOC_XC16X_SEG,
-+ BFD_RELOC_XC16X_SOF,
-+
-+/* Relocations used by VAX ELF. */
-+ BFD_RELOC_VAX_GLOB_DAT,
-+ BFD_RELOC_VAX_JMP_SLOT,
-+ BFD_RELOC_VAX_RELATIVE,
-+
-+/* Morpho MT - 16 bit immediate relocation. */
-+ BFD_RELOC_MT_PC16,
-+
-+/* Morpho MT - Hi 16 bits of an address. */
-+ BFD_RELOC_MT_HI16,
-+
-+/* Morpho MT - Low 16 bits of an address. */
-+ BFD_RELOC_MT_LO16,
-+
-+/* Morpho MT - Used to tell the linker which vtable entries are used. */
-+ BFD_RELOC_MT_GNU_VTINHERIT,
-+
-+/* Morpho MT - Used to tell the linker which vtable entries are used. */
-+ BFD_RELOC_MT_GNU_VTENTRY,
-+
-+/* Morpho MT - 8 bit immediate relocation. */
-+ BFD_RELOC_MT_PCINSN8,
-+
-+/* msp430 specific relocation codes */
-+ BFD_RELOC_MSP430_10_PCREL,
-+ BFD_RELOC_MSP430_16_PCREL,
-+ BFD_RELOC_MSP430_16,
-+ BFD_RELOC_MSP430_16_PCREL_BYTE,
-+ BFD_RELOC_MSP430_16_BYTE,
-+ BFD_RELOC_MSP430_2X_PCREL,
-+ BFD_RELOC_MSP430_RL_PCREL,
-+
-+/* IQ2000 Relocations. */
-+ BFD_RELOC_IQ2000_OFFSET_16,
-+ BFD_RELOC_IQ2000_OFFSET_21,
-+ BFD_RELOC_IQ2000_UHI16,
-+
-+/* Special Xtensa relocation used only by PLT entries in ELF shared
-+objects to indicate that the runtime linker should set the value
-+to one of its own internal functions or data structures. */
-+ BFD_RELOC_XTENSA_RTLD,
-+
-+/* Xtensa relocations for ELF shared objects. */
-+ BFD_RELOC_XTENSA_GLOB_DAT,
-+ BFD_RELOC_XTENSA_JMP_SLOT,
-+ BFD_RELOC_XTENSA_RELATIVE,
-+
-+/* Xtensa relocation used in ELF object files for symbols that may require
-+PLT entries. Otherwise, this is just a generic 32-bit relocation. */
-+ BFD_RELOC_XTENSA_PLT,
-+
-+/* Xtensa relocations to mark the difference of two local symbols.
-+These are only needed to support linker relaxation and can be ignored
-+when not relaxing. The field is set to the value of the difference
-+assuming no relaxation. The relocation encodes the position of the
-+first symbol so the linker can determine whether to adjust the field
-+value. */
-+ BFD_RELOC_XTENSA_DIFF8,
-+ BFD_RELOC_XTENSA_DIFF16,
-+ BFD_RELOC_XTENSA_DIFF32,
-+
-+/* Generic Xtensa relocations for instruction operands. Only the slot
-+number is encoded in the relocation. The relocation applies to the
-+last PC-relative immediate operand, or if there are no PC-relative
-+immediates, to the last immediate operand. */
-+ BFD_RELOC_XTENSA_SLOT0_OP,
-+ BFD_RELOC_XTENSA_SLOT1_OP,
-+ BFD_RELOC_XTENSA_SLOT2_OP,
-+ BFD_RELOC_XTENSA_SLOT3_OP,
-+ BFD_RELOC_XTENSA_SLOT4_OP,
-+ BFD_RELOC_XTENSA_SLOT5_OP,
-+ BFD_RELOC_XTENSA_SLOT6_OP,
-+ BFD_RELOC_XTENSA_SLOT7_OP,
-+ BFD_RELOC_XTENSA_SLOT8_OP,
-+ BFD_RELOC_XTENSA_SLOT9_OP,
-+ BFD_RELOC_XTENSA_SLOT10_OP,
-+ BFD_RELOC_XTENSA_SLOT11_OP,
-+ BFD_RELOC_XTENSA_SLOT12_OP,
-+ BFD_RELOC_XTENSA_SLOT13_OP,
-+ BFD_RELOC_XTENSA_SLOT14_OP,
-+
-+/* Alternate Xtensa relocations. Only the slot is encoded in the
-+relocation. The meaning of these relocations is opcode-specific. */
-+ BFD_RELOC_XTENSA_SLOT0_ALT,
-+ BFD_RELOC_XTENSA_SLOT1_ALT,
-+ BFD_RELOC_XTENSA_SLOT2_ALT,
-+ BFD_RELOC_XTENSA_SLOT3_ALT,
-+ BFD_RELOC_XTENSA_SLOT4_ALT,
-+ BFD_RELOC_XTENSA_SLOT5_ALT,
-+ BFD_RELOC_XTENSA_SLOT6_ALT,
-+ BFD_RELOC_XTENSA_SLOT7_ALT,
-+ BFD_RELOC_XTENSA_SLOT8_ALT,
-+ BFD_RELOC_XTENSA_SLOT9_ALT,
-+ BFD_RELOC_XTENSA_SLOT10_ALT,
-+ BFD_RELOC_XTENSA_SLOT11_ALT,
-+ BFD_RELOC_XTENSA_SLOT12_ALT,
-+ BFD_RELOC_XTENSA_SLOT13_ALT,
-+ BFD_RELOC_XTENSA_SLOT14_ALT,
-+
-+/* Xtensa relocations for backward compatibility. These have all been
-+replaced by BFD_RELOC_XTENSA_SLOT0_OP. */
-+ BFD_RELOC_XTENSA_OP0,
-+ BFD_RELOC_XTENSA_OP1,
-+ BFD_RELOC_XTENSA_OP2,
-+
-+/* Xtensa relocation to mark that the assembler expanded the
-+instructions from an original target. The expansion size is
-+encoded in the reloc size. */
-+ BFD_RELOC_XTENSA_ASM_EXPAND,
-+
-+/* Xtensa relocation to mark that the linker should simplify
-+assembler-expanded instructions. This is commonly used
-+internally by the linker after analysis of a
-+BFD_RELOC_XTENSA_ASM_EXPAND. */
-+ BFD_RELOC_XTENSA_ASM_SIMPLIFY,
-+
-+/* 8 bit signed offset in (ix+d) or (iy+d). */
-+ BFD_RELOC_Z80_DISP8,
-+
-+/* DJNZ offset. */
-+ BFD_RELOC_Z8K_DISP7,
-+
-+/* CALR offset. */
-+ BFD_RELOC_Z8K_CALLR,
-+
-+/* 4 bit value. */
-+ BFD_RELOC_Z8K_IMM4L,
-+ BFD_RELOC_UNUSED };
-+typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
-+reloc_howto_type *bfd_reloc_type_lookup
-+ (bfd *abfd, bfd_reloc_code_real_type code);
-+reloc_howto_type *bfd_reloc_name_lookup
-+ (bfd *abfd, const char *reloc_name);
-+
-+const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code);
-+
-+/* Extracted from syms.c. */
-+
-+typedef struct bfd_symbol
-+{
-+ /* A pointer to the BFD which owns the symbol. This information
-+ is necessary so that a back end can work out what additional
-+ information (invisible to the application writer) is carried
-+ with the symbol.
-+
-+ This field is *almost* redundant, since you can use section->owner
-+ instead, except that some symbols point to the global sections
-+ bfd_{abs,com,und}_section. This could be fixed by making
-+ these globals be per-bfd (or per-target-flavor). FIXME. */
-+ struct bfd *the_bfd; /* Use bfd_asymbol_bfd(sym) to access this field. */
-+
-+ /* The text of the symbol. The name is left alone, and not copied; the
-+ application may not alter it. */
-+ const char *name;
-+
-+ /* The value of the symbol. This really should be a union of a
-+ numeric value with a pointer, since some flags indicate that
-+ a pointer to another symbol is stored here. */
-+ symvalue value;
-+
-+ /* Attributes of a symbol. */
-+#define BSF_NO_FLAGS 0x00
-+
-+ /* The symbol has local scope; <<static>> in <<C>>. The value
-+ is the offset into the section of the data. */
-+#define BSF_LOCAL 0x01
-+
-+ /* The symbol has global scope; initialized data in <<C>>. The
-+ value is the offset into the section of the data. */
-+#define BSF_GLOBAL 0x02
-+
-+ /* The symbol has global scope and is exported. The value is
-+ the offset into the section of the data. */
-+#define BSF_EXPORT BSF_GLOBAL /* No real difference. */
-+
-+ /* A normal C symbol would be one of:
-+ <<BSF_LOCAL>>, <<BSF_FORT_COMM>>, <<BSF_UNDEFINED>> or
-+ <<BSF_GLOBAL>>. */
-+
-+ /* The symbol is a debugging record. The value has an arbitrary
-+ meaning, unless BSF_DEBUGGING_RELOC is also set. */
-+#define BSF_DEBUGGING 0x08
-+
-+ /* The symbol denotes a function entry point. Used in ELF,
-+ perhaps others someday. */
-+#define BSF_FUNCTION 0x10
-+
-+ /* Used by the linker. */
-+#define BSF_KEEP 0x20
-+#define BSF_KEEP_G 0x40
-+
-+ /* A weak global symbol, overridable without warnings by
-+ a regular global symbol of the same name. */
-+#define BSF_WEAK 0x80
-+
-+ /* This symbol was created to point to a section, e.g. ELF's
-+ STT_SECTION symbols. */
-+#define BSF_SECTION_SYM 0x100
-+
-+ /* The symbol used to be a common symbol, but now it is
-+ allocated. */
-+#define BSF_OLD_COMMON 0x200
-+
-+ /* The default value for common data. */
-+#define BFD_FORT_COMM_DEFAULT_VALUE 0
-+
-+ /* In some files the type of a symbol sometimes alters its
-+ location in an output file - ie in coff a <<ISFCN>> symbol
-+ which is also <<C_EXT>> symbol appears where it was
-+ declared and not at the end of a section. This bit is set
-+ by the target BFD part to convey this information. */
-+#define BSF_NOT_AT_END 0x400
-+
-+ /* Signal that the symbol is the label of constructor section. */
-+#define BSF_CONSTRUCTOR 0x800
-+
-+ /* Signal that the symbol is a warning symbol. The name is a
-+ warning. The name of the next symbol is the one to warn about;
-+ if a reference is made to a symbol with the same name as the next
-+ symbol, a warning is issued by the linker. */
-+#define BSF_WARNING 0x1000
-+
-+ /* Signal that the symbol is indirect. This symbol is an indirect
-+ pointer to the symbol with the same name as the next symbol. */
-+#define BSF_INDIRECT 0x2000
-+
-+ /* BSF_FILE marks symbols that contain a file name. This is used
-+ for ELF STT_FILE symbols. */
-+#define BSF_FILE 0x4000
-+
-+ /* Symbol is from dynamic linking information. */
-+#define BSF_DYNAMIC 0x8000
-+
-+ /* The symbol denotes a data object. Used in ELF, and perhaps
-+ others someday. */
-+#define BSF_OBJECT 0x10000
-+
-+ /* This symbol is a debugging symbol. The value is the offset
-+ into the section of the data. BSF_DEBUGGING should be set
-+ as well. */
-+#define BSF_DEBUGGING_RELOC 0x20000
-+
-+ /* This symbol is thread local. Used in ELF. */
-+#define BSF_THREAD_LOCAL 0x40000
-+
-+ /* This symbol represents a complex relocation expression,
-+ with the expression tree serialized in the symbol name. */
-+#define BSF_RELC 0x80000
-+
-+ /* This symbol represents a signed complex relocation expression,
-+ with the expression tree serialized in the symbol name. */
-+#define BSF_SRELC 0x100000
-+
-+ flagword flags;
-+
-+ /* A pointer to the section to which this symbol is
-+ relative. This will always be non NULL, there are special
-+ sections for undefined and absolute symbols. */
-+ struct bfd_section *section;
-+
-+ /* Back end special data. */
-+ union
-+ {
-+ void *p;
-+ bfd_vma i;
-+ }
-+ udata;
-+}
-+asymbol;
-+
-+#define bfd_get_symtab_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
-+
-+bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym);
-+
-+bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
-+
-+#define bfd_is_local_label_name(abfd, name) \
-+ BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
-+
-+bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym);
-+
-+#define bfd_is_target_special_symbol(abfd, sym) \
-+ BFD_SEND (abfd, _bfd_is_target_special_symbol, (abfd, sym))
-+
-+#define bfd_canonicalize_symtab(abfd, location) \
-+ BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location))
-+
-+bfd_boolean bfd_set_symtab
-+ (bfd *abfd, asymbol **location, unsigned int count);
-+
-+void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol);
-+
-+#define bfd_make_empty_symbol(abfd) \
-+ BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
-+
-+asymbol *_bfd_generic_make_empty_symbol (bfd *);
-+
-+#define bfd_make_debug_symbol(abfd,ptr,size) \
-+ BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
-+
-+int bfd_decode_symclass (asymbol *symbol);
-+
-+bfd_boolean bfd_is_undefined_symclass (int symclass);
-+
-+void bfd_symbol_info (asymbol *symbol, symbol_info *ret);
-+
-+bfd_boolean bfd_copy_private_symbol_data
-+ (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
-+
-+#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
-+ BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
-+ (ibfd, isymbol, obfd, osymbol))
-+
-+/* Extracted from bfd.c. */
-+struct bfd
-+{
-+ /* A unique identifier of the BFD */
-+ unsigned int id;
-+
-+ /* The filename the application opened the BFD with. */
-+ const char *filename;
-+
-+ /* A pointer to the target jump table. */
-+ const struct bfd_target *xvec;
-+
-+ /* The IOSTREAM, and corresponding IO vector that provide access
-+ to the file backing the BFD. */
-+ void *iostream;
-+ const struct bfd_iovec *iovec;
-+
-+ /* Is the file descriptor being cached? That is, can it be closed as
-+ needed, and re-opened when accessed later? */
-+ bfd_boolean cacheable;
-+
-+ /* Marks whether there was a default target specified when the
-+ BFD was opened. This is used to select which matching algorithm
-+ to use to choose the back end. */
-+ bfd_boolean target_defaulted;
-+
-+ /* The caching routines use these to maintain a
-+ least-recently-used list of BFDs. */
-+ struct bfd *lru_prev, *lru_next;
-+
-+ /* When a file is closed by the caching routines, BFD retains
-+ state information on the file here... */
-+ ufile_ptr where;
-+
-+ /* ... and here: (``once'' means at least once). */
-+ bfd_boolean opened_once;
-+
-+ /* Set if we have a locally maintained mtime value, rather than
-+ getting it from the file each time. */
-+ bfd_boolean mtime_set;
-+
-+ /* File modified time, if mtime_set is TRUE. */
-+ long mtime;
-+
-+ /* Reserved for an unimplemented file locking extension. */
-+ int ifd;
-+
-+ /* The format which belongs to the BFD. (object, core, etc.) */
-+ bfd_format format;
-+
-+ /* The direction with which the BFD was opened. */
-+ enum bfd_direction
-+ {
-+ no_direction = 0,
-+ read_direction = 1,
-+ write_direction = 2,
-+ both_direction = 3
-+ }
-+ direction;
-+
-+ /* Format_specific flags. */
-+ flagword flags;
-+
-+ /* Currently my_archive is tested before adding origin to
-+ anything. I believe that this can become always an add of
-+ origin, with origin set to 0 for non archive files. */
-+ ufile_ptr origin;
-+
-+ /* Remember when output has begun, to stop strange things
-+ from happening. */
-+ bfd_boolean output_has_begun;
-+
-+ /* A hash table for section names. */
-+ struct bfd_hash_table section_htab;
-+
-+ /* Pointer to linked list of sections. */
-+ struct bfd_section *sections;
-+
-+ /* The last section on the section list. */
-+ struct bfd_section *section_last;
-+
-+ /* The number of sections. */
-+ unsigned int section_count;
-+
-+ /* Stuff only useful for object files:
-+ The start address. */
-+ bfd_vma start_address;
-+
-+ /* Used for input and output. */
-+ unsigned int symcount;
-+
-+ /* Symbol table for output BFD (with symcount entries). */
-+ struct bfd_symbol **outsymbols;
-+
-+ /* Used for slurped dynamic symbol tables. */
-+ unsigned int dynsymcount;
-+
-+ /* Pointer to structure which contains architecture information. */
-+ const struct bfd_arch_info *arch_info;
-+
-+ /* Flag set if symbols from this BFD should not be exported. */
-+ bfd_boolean no_export;
-+
-+ /* Stuff only useful for archives. */
-+ void *arelt_data;
-+ struct bfd *my_archive; /* The containing archive BFD. */
-+ struct bfd *archive_next; /* The next BFD in the archive. */
-+ struct bfd *archive_head; /* The first BFD in the archive. */
-+ bfd_boolean has_armap;
-+
-+ /* A chain of BFD structures involved in a link. */
-+ struct bfd *link_next;
-+
-+ /* A field used by _bfd_generic_link_add_archive_symbols. This will
-+ be used only for archive elements. */
-+ int archive_pass;
-+
-+ /* Used by the back end to hold private data. */
-+ union
-+ {
-+ struct aout_data_struct *aout_data;
-+ struct artdata *aout_ar_data;
-+ struct _oasys_data *oasys_obj_data;
-+ struct _oasys_ar_data *oasys_ar_data;
-+ struct coff_tdata *coff_obj_data;
-+ struct pe_tdata *pe_obj_data;
-+ struct xcoff_tdata *xcoff_obj_data;
-+ struct ecoff_tdata *ecoff_obj_data;
-+ struct ieee_data_struct *ieee_data;
-+ struct ieee_ar_data_struct *ieee_ar_data;
-+ struct srec_data_struct *srec_data;
-+ struct ihex_data_struct *ihex_data;
-+ struct tekhex_data_struct *tekhex_data;
-+ struct elf_obj_tdata *elf_obj_data;
-+ struct nlm_obj_tdata *nlm_obj_data;
-+ struct bout_data_struct *bout_data;
-+ struct mmo_data_struct *mmo_data;
-+ struct sun_core_struct *sun_core_data;
-+ struct sco5_core_struct *sco5_core_data;
-+ struct trad_core_struct *trad_core_data;
-+ struct som_data_struct *som_data;
-+ struct hpux_core_struct *hpux_core_data;
-+ struct hppabsd_core_struct *hppabsd_core_data;
-+ struct sgi_core_struct *sgi_core_data;
-+ struct lynx_core_struct *lynx_core_data;
-+ struct osf_core_struct *osf_core_data;
-+ struct cisco_core_struct *cisco_core_data;
-+ struct versados_data_struct *versados_data;
-+ struct netbsd_core_struct *netbsd_core_data;
-+ struct mach_o_data_struct *mach_o_data;
-+ struct mach_o_fat_data_struct *mach_o_fat_data;
-+ struct bfd_pef_data_struct *pef_data;
-+ struct bfd_pef_xlib_data_struct *pef_xlib_data;
-+ struct bfd_sym_data_struct *sym_data;
-+ void *any;
-+ }
-+ tdata;
-+
-+ /* Used by the application to hold private data. */
-+ void *usrdata;
-+
-+ /* Where all the allocated stuff under this BFD goes. This is a
-+ struct objalloc *, but we use void * to avoid requiring the inclusion
-+ of objalloc.h. */
-+ void *memory;
-+};
-+
-+typedef enum bfd_error
-+{
-+ bfd_error_no_error = 0,
-+ bfd_error_system_call,
-+ bfd_error_invalid_target,
-+ bfd_error_wrong_format,
-+ bfd_error_wrong_object_format,
-+ bfd_error_invalid_operation,
-+ bfd_error_no_memory,
-+ bfd_error_no_symbols,
-+ bfd_error_no_armap,
-+ bfd_error_no_more_archived_files,
-+ bfd_error_malformed_archive,
-+ bfd_error_file_not_recognized,
-+ bfd_error_file_ambiguously_recognized,
-+ bfd_error_no_contents,
-+ bfd_error_nonrepresentable_section,
-+ bfd_error_no_debug_section,
-+ bfd_error_bad_value,
-+ bfd_error_file_truncated,
-+ bfd_error_file_too_big,
-+ bfd_error_on_input,
-+ bfd_error_invalid_error_code
-+}
-+bfd_error_type;
-+
-+bfd_error_type bfd_get_error (void);
-+
-+void bfd_set_error (bfd_error_type error_tag, ...);
-+
-+const char *bfd_errmsg (bfd_error_type error_tag);
-+
-+void bfd_perror (const char *message);
-+
-+typedef void (*bfd_error_handler_type) (const char *, ...);
-+
-+bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
-+
-+void bfd_set_error_program_name (const char *);
-+
-+bfd_error_handler_type bfd_get_error_handler (void);
-+
-+long bfd_get_reloc_upper_bound (bfd *abfd, asection *sect);
-+
-+long bfd_canonicalize_reloc
-+ (bfd *abfd, asection *sec, arelent **loc, asymbol **syms);
-+
-+void bfd_set_reloc
-+ (bfd *abfd, asection *sec, arelent **rel, unsigned int count);
-+
-+bfd_boolean bfd_set_file_flags (bfd *abfd, flagword flags);
-+
-+int bfd_get_arch_size (bfd *abfd);
-+
-+int bfd_get_sign_extend_vma (bfd *abfd);
-+
-+bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma);
-+
-+unsigned int bfd_get_gp_size (bfd *abfd);
-+
-+void bfd_set_gp_size (bfd *abfd, unsigned int i);
-+
-+bfd_vma bfd_scan_vma (const char *string, const char **end, int base);
-+
-+bfd_boolean bfd_copy_private_header_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_copy_private_header_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_copy_private_header_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_copy_private_bfd_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_merge_private_bfd_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_merge_private_bfd_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_set_private_flags (bfd *abfd, flagword flags);
-+
-+#define bfd_set_private_flags(abfd, flags) \
-+ BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags))
-+#define bfd_sizeof_headers(abfd, info) \
-+ BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info))
-+
-+#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
-+ BFD_SEND (abfd, _bfd_find_nearest_line, \
-+ (abfd, sec, syms, off, file, func, line))
-+
-+#define bfd_find_line(abfd, syms, sym, file, line) \
-+ BFD_SEND (abfd, _bfd_find_line, \
-+ (abfd, syms, sym, file, line))
-+
-+#define bfd_find_inliner_info(abfd, file, func, line) \
-+ BFD_SEND (abfd, _bfd_find_inliner_info, \
-+ (abfd, file, func, line))
-+
-+#define bfd_debug_info_start(abfd) \
-+ BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
-+
-+#define bfd_debug_info_end(abfd) \
-+ BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
-+
-+#define bfd_debug_info_accumulate(abfd, section) \
-+ BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
-+
-+#define bfd_stat_arch_elt(abfd, stat) \
-+ BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
-+
-+#define bfd_update_armap_timestamp(abfd) \
-+ BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
-+
-+#define bfd_set_arch_mach(abfd, arch, mach)\
-+ BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
-+
-+#define bfd_relax_section(abfd, section, link_info, again) \
-+ BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
-+
-+#define bfd_gc_sections(abfd, link_info) \
-+ BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
-+
-+#define bfd_merge_sections(abfd, link_info) \
-+ BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
-+
-+#define bfd_is_group_section(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
-+
-+#define bfd_discard_group(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
-+
-+#define bfd_link_hash_table_create(abfd) \
-+ BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
-+
-+#define bfd_link_hash_table_free(abfd, hash) \
-+ BFD_SEND (abfd, _bfd_link_hash_table_free, (hash))
-+
-+#define bfd_link_add_symbols(abfd, info) \
-+ BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
-+
-+#define bfd_link_just_syms(abfd, sec, info) \
-+ BFD_SEND (abfd, _bfd_link_just_syms, (sec, info))
-+
-+#define bfd_final_link(abfd, info) \
-+ BFD_SEND (abfd, _bfd_final_link, (abfd, info))
-+
-+#define bfd_free_cached_info(abfd) \
-+ BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
-+
-+#define bfd_get_dynamic_symtab_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
-+
-+#define bfd_print_private_bfd_data(abfd, file)\
-+ BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
-+
-+#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
-+ BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
-+
-+#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
-+ BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
-+ dyncount, dynsyms, ret))
-+
-+#define bfd_get_dynamic_reloc_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
-+
-+#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
-+ BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
-+
-+extern bfd_byte *bfd_get_relocated_section_contents
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *,
-+ bfd_boolean, asymbol **);
-+
-+bfd_boolean bfd_alt_mach_code (bfd *abfd, int alternative);
-+
-+struct bfd_preserve
-+{
-+ void *marker;
-+ void *tdata;
-+ flagword flags;
-+ const struct bfd_arch_info *arch_info;
-+ struct bfd_section *sections;
-+ struct bfd_section *section_last;
-+ unsigned int section_count;
-+ struct bfd_hash_table section_htab;
-+};
-+
-+bfd_boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
-+
-+void bfd_preserve_restore (bfd *, struct bfd_preserve *);
-+
-+void bfd_preserve_finish (bfd *, struct bfd_preserve *);
-+
-+bfd_vma bfd_emul_get_maxpagesize (const char *);
-+
-+void bfd_emul_set_maxpagesize (const char *, bfd_vma);
-+
-+bfd_vma bfd_emul_get_commonpagesize (const char *);
-+
-+void bfd_emul_set_commonpagesize (const char *, bfd_vma);
-+
-+char *bfd_demangle (bfd *, const char *, int);
-+
-+/* Extracted from archive.c. */
-+symindex bfd_get_next_mapent
-+ (bfd *abfd, symindex previous, carsym **sym);
-+
-+bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head);
-+
-+bfd *bfd_openr_next_archived_file (bfd *archive, bfd *previous);
-+
-+/* Extracted from corefile.c. */
-+const char *bfd_core_file_failing_command (bfd *abfd);
-+
-+int bfd_core_file_failing_signal (bfd *abfd);
-+
-+bfd_boolean core_file_matches_executable_p
-+ (bfd *core_bfd, bfd *exec_bfd);
-+
-+bfd_boolean generic_core_file_matches_executable_p
-+ (bfd *core_bfd, bfd *exec_bfd);
-+
-+/* Extracted from targets.c. */
-+#define BFD_SEND(bfd, message, arglist) \
-+ ((*((bfd)->xvec->message)) arglist)
-+
-+#ifdef DEBUG_BFD_SEND
-+#undef BFD_SEND
-+#define BFD_SEND(bfd, message, arglist) \
-+ (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-+ ((*((bfd)->xvec->message)) arglist) : \
-+ (bfd_assert (__FILE__,__LINE__), NULL))
-+#endif
-+#define BFD_SEND_FMT(bfd, message, arglist) \
-+ (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist)
-+
-+#ifdef DEBUG_BFD_SEND
-+#undef BFD_SEND_FMT
-+#define BFD_SEND_FMT(bfd, message, arglist) \
-+ (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-+ (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \
-+ (bfd_assert (__FILE__,__LINE__), NULL))
-+#endif
-+
-+enum bfd_flavour
-+{
-+ bfd_target_unknown_flavour,
-+ bfd_target_aout_flavour,
-+ bfd_target_coff_flavour,
-+ bfd_target_ecoff_flavour,
-+ bfd_target_xcoff_flavour,
-+ bfd_target_elf_flavour,
-+ bfd_target_ieee_flavour,
-+ bfd_target_nlm_flavour,
-+ bfd_target_oasys_flavour,
-+ bfd_target_tekhex_flavour,
-+ bfd_target_srec_flavour,
-+ bfd_target_ihex_flavour,
-+ bfd_target_som_flavour,
-+ bfd_target_os9k_flavour,
-+ bfd_target_versados_flavour,
-+ bfd_target_msdos_flavour,
-+ bfd_target_ovax_flavour,
-+ bfd_target_evax_flavour,
-+ bfd_target_mmo_flavour,
-+ bfd_target_mach_o_flavour,
-+ bfd_target_pef_flavour,
-+ bfd_target_pef_xlib_flavour,
-+ bfd_target_sym_flavour
-+};
-+
-+enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
-+
-+/* Forward declaration. */
-+typedef struct bfd_link_info _bfd_link_info;
-+
-+typedef struct bfd_target
-+{
-+ /* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. */
-+ char *name;
-+
-+ /* The "flavour" of a back end is a general indication about
-+ the contents of a file. */
-+ enum bfd_flavour flavour;
-+
-+ /* The order of bytes within the data area of a file. */
-+ enum bfd_endian byteorder;
-+
-+ /* The order of bytes within the header parts of a file. */
-+ enum bfd_endian header_byteorder;
-+
-+ /* A mask of all the flags which an executable may have set -
-+ from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>. */
-+ flagword object_flags;
-+
-+ /* A mask of all the flags which a section may have set - from
-+ the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>. */
-+ flagword section_flags;
-+
-+ /* The character normally found at the front of a symbol.
-+ (if any), perhaps `_'. */
-+ char symbol_leading_char;
-+
-+ /* The pad character for file names within an archive header. */
-+ char ar_pad_char;
-+
-+ /* The maximum number of characters in an archive header. */
-+ unsigned short ar_max_namelen;
-+
-+ /* Entries for byte swapping for data. These are different from the
-+ other entry points, since they don't take a BFD as the first argument.
-+ Certain other handlers could do the same. */
-+ bfd_uint64_t (*bfd_getx64) (const void *);
-+ bfd_int64_t (*bfd_getx_signed_64) (const void *);
-+ void (*bfd_putx64) (bfd_uint64_t, void *);
-+ bfd_vma (*bfd_getx32) (const void *);
-+ bfd_signed_vma (*bfd_getx_signed_32) (const void *);
-+ void (*bfd_putx32) (bfd_vma, void *);
-+ bfd_vma (*bfd_getx16) (const void *);
-+ bfd_signed_vma (*bfd_getx_signed_16) (const void *);
-+ void (*bfd_putx16) (bfd_vma, void *);
-+
-+ /* Byte swapping for the headers. */
-+ bfd_uint64_t (*bfd_h_getx64) (const void *);
-+ bfd_int64_t (*bfd_h_getx_signed_64) (const void *);
-+ void (*bfd_h_putx64) (bfd_uint64_t, void *);
-+ bfd_vma (*bfd_h_getx32) (const void *);
-+ bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
-+ void (*bfd_h_putx32) (bfd_vma, void *);
-+ bfd_vma (*bfd_h_getx16) (const void *);
-+ bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
-+ void (*bfd_h_putx16) (bfd_vma, void *);
-+
-+ /* Format dependent routines: these are vectors of entry points
-+ within the target vector structure, one for each format to check. */
-+
-+ /* Check the format of a file being read. Return a <<bfd_target *>> or zero. */
-+ const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
-+
-+ /* Set the format of a file being written. */
-+ bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
-+
-+ /* Write cached information into a file being written, at <<bfd_close>>. */
-+ bfd_boolean (*_bfd_write_contents[bfd_type_end]) (bfd *);
-+
-+
-+ /* Generic entry points. */
-+#define BFD_JUMP_TABLE_GENERIC(NAME) \
-+ NAME##_close_and_cleanup, \
-+ NAME##_bfd_free_cached_info, \
-+ NAME##_new_section_hook, \
-+ NAME##_get_section_contents, \
-+ NAME##_get_section_contents_in_window
-+
-+ /* Called when the BFD is being closed to do any necessary cleanup. */
-+ bfd_boolean (*_close_and_cleanup) (bfd *);
-+ /* Ask the BFD to free all cached information. */
-+ bfd_boolean (*_bfd_free_cached_info) (bfd *);
-+ /* Called when a new section is created. */
-+ bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
-+ /* Read the contents of a section. */
-+ bfd_boolean (*_bfd_get_section_contents)
-+ (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
-+ bfd_boolean (*_bfd_get_section_contents_in_window)
-+ (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);
-+
-+ /* Entry points to copy private data. */
-+#define BFD_JUMP_TABLE_COPY(NAME) \
-+ NAME##_bfd_copy_private_bfd_data, \
-+ NAME##_bfd_merge_private_bfd_data, \
-+ _bfd_generic_init_private_section_data, \
-+ NAME##_bfd_copy_private_section_data, \
-+ NAME##_bfd_copy_private_symbol_data, \
-+ NAME##_bfd_copy_private_header_data, \
-+ NAME##_bfd_set_private_flags, \
-+ NAME##_bfd_print_private_bfd_data
-+
-+ /* Called to copy BFD general private data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
-+ /* Called to merge BFD general private data from one object file
-+ to a common output file when linking. */
-+ bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *);
-+ /* Called to initialize BFD private section data from one object file
-+ to another. */
-+#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \
-+ BFD_SEND (obfd, _bfd_init_private_section_data, (ibfd, isec, obfd, osec, link_info))
-+ bfd_boolean (*_bfd_init_private_section_data)
-+ (bfd *, sec_ptr, bfd *, sec_ptr, struct bfd_link_info *);
-+ /* Called to copy BFD private section data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_section_data)
-+ (bfd *, sec_ptr, bfd *, sec_ptr);
-+ /* Called to copy BFD private symbol data from one symbol
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_symbol_data)
-+ (bfd *, asymbol *, bfd *, asymbol *);
-+ /* Called to copy BFD private header data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_header_data)
-+ (bfd *, bfd *);
-+ /* Called to set private backend flags. */
-+ bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
-+
-+ /* Called to print private BFD data. */
-+ bfd_boolean (*_bfd_print_private_bfd_data) (bfd *, void *);
-+
-+ /* Core file entry points. */
-+#define BFD_JUMP_TABLE_CORE(NAME) \
-+ NAME##_core_file_failing_command, \
-+ NAME##_core_file_failing_signal, \
-+ NAME##_core_file_matches_executable_p
-+
-+ char * (*_core_file_failing_command) (bfd *);
-+ int (*_core_file_failing_signal) (bfd *);
-+ bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);
-+
-+ /* Archive entry points. */
-+#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
-+ NAME##_slurp_armap, \
-+ NAME##_slurp_extended_name_table, \
-+ NAME##_construct_extended_name_table, \
-+ NAME##_truncate_arname, \
-+ NAME##_write_armap, \
-+ NAME##_read_ar_hdr, \
-+ NAME##_openr_next_archived_file, \
-+ NAME##_get_elt_at_index, \
-+ NAME##_generic_stat_arch_elt, \
-+ NAME##_update_armap_timestamp
-+
-+ bfd_boolean (*_bfd_slurp_armap) (bfd *);
-+ bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
-+ bfd_boolean (*_bfd_construct_extended_name_table)
-+ (bfd *, char **, bfd_size_type *, const char **);
-+ void (*_bfd_truncate_arname) (bfd *, const char *, char *);
-+ bfd_boolean (*write_armap)
-+ (bfd *, unsigned int, struct orl *, unsigned int, int);
-+ void * (*_bfd_read_ar_hdr_fn) (bfd *);
-+ bfd * (*openr_next_archived_file) (bfd *, bfd *);
-+#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
-+ bfd * (*_bfd_get_elt_at_index) (bfd *, symindex);
-+ int (*_bfd_stat_arch_elt) (bfd *, struct stat *);
-+ bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
-+
-+ /* Entry points used for symbols. */
-+#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
-+ NAME##_get_symtab_upper_bound, \
-+ NAME##_canonicalize_symtab, \
-+ NAME##_make_empty_symbol, \
-+ NAME##_print_symbol, \
-+ NAME##_get_symbol_info, \
-+ NAME##_bfd_is_local_label_name, \
-+ NAME##_bfd_is_target_special_symbol, \
-+ NAME##_get_lineno, \
-+ NAME##_find_nearest_line, \
-+ _bfd_generic_find_line, \
-+ NAME##_find_inliner_info, \
-+ NAME##_bfd_make_debug_symbol, \
-+ NAME##_read_minisymbols, \
-+ NAME##_minisymbol_to_symbol
-+
-+ long (*_bfd_get_symtab_upper_bound) (bfd *);
-+ long (*_bfd_canonicalize_symtab)
-+ (bfd *, struct bfd_symbol **);
-+ struct bfd_symbol *
-+ (*_bfd_make_empty_symbol) (bfd *);
-+ void (*_bfd_print_symbol)
-+ (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
-+#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
-+ void (*_bfd_get_symbol_info)
-+ (bfd *, struct bfd_symbol *, symbol_info *);
-+#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
-+ bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
-+ bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
-+ alent * (*_get_lineno) (bfd *, struct bfd_symbol *);
-+ bfd_boolean (*_bfd_find_nearest_line)
-+ (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
-+ const char **, const char **, unsigned int *);
-+ bfd_boolean (*_bfd_find_line)
-+ (bfd *, struct bfd_symbol **, struct bfd_symbol *,
-+ const char **, unsigned int *);
-+ bfd_boolean (*_bfd_find_inliner_info)
-+ (bfd *, const char **, const char **, unsigned int *);
-+ /* Back-door to allow format-aware applications to create debug symbols
-+ while using BFD for everything else. Currently used by the assembler
-+ when creating COFF files. */
-+ asymbol * (*_bfd_make_debug_symbol)
-+ (bfd *, void *, unsigned long size);
-+#define bfd_read_minisymbols(b, d, m, s) \
-+ BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-+ long (*_read_minisymbols)
-+ (bfd *, bfd_boolean, void **, unsigned int *);
-+#define bfd_minisymbol_to_symbol(b, d, m, f) \
-+ BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-+ asymbol * (*_minisymbol_to_symbol)
-+ (bfd *, bfd_boolean, const void *, asymbol *);
-+
-+ /* Routines for relocs. */
-+#define BFD_JUMP_TABLE_RELOCS(NAME) \
-+ NAME##_get_reloc_upper_bound, \
-+ NAME##_canonicalize_reloc, \
-+ NAME##_bfd_reloc_type_lookup, \
-+ NAME##_bfd_reloc_name_lookup
-+
-+ long (*_get_reloc_upper_bound) (bfd *, sec_ptr);
-+ long (*_bfd_canonicalize_reloc)
-+ (bfd *, sec_ptr, arelent **, struct bfd_symbol **);
-+ /* See documentation on reloc types. */
-+ reloc_howto_type *
-+ (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
-+ reloc_howto_type *
-+ (*reloc_name_lookup) (bfd *, const char *);
-+
-+
-+ /* Routines used when writing an object file. */
-+#define BFD_JUMP_TABLE_WRITE(NAME) \
-+ NAME##_set_arch_mach, \
-+ NAME##_set_section_contents
-+
-+ bfd_boolean (*_bfd_set_arch_mach)
-+ (bfd *, enum bfd_architecture, unsigned long);
-+ bfd_boolean (*_bfd_set_section_contents)
-+ (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
-+
-+ /* Routines used by the linker. */
-+#define BFD_JUMP_TABLE_LINK(NAME) \
-+ NAME##_sizeof_headers, \
-+ NAME##_bfd_get_relocated_section_contents, \
-+ NAME##_bfd_relax_section, \
-+ NAME##_bfd_link_hash_table_create, \
-+ NAME##_bfd_link_hash_table_free, \
-+ NAME##_bfd_link_add_symbols, \
-+ NAME##_bfd_link_just_syms, \
-+ NAME##_bfd_final_link, \
-+ NAME##_bfd_link_split_section, \
-+ NAME##_bfd_gc_sections, \
-+ NAME##_bfd_merge_sections, \
-+ NAME##_bfd_is_group_section, \
-+ NAME##_bfd_discard_group, \
-+ NAME##_section_already_linked \
-+
-+ int (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
-+ bfd_byte * (*_bfd_get_relocated_section_contents)
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *,
-+ bfd_byte *, bfd_boolean, struct bfd_symbol **);
-+
-+ bfd_boolean (*_bfd_relax_section)
-+ (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
-+
-+ /* Create a hash table for the linker. Different backends store
-+ different information in this table. */
-+ struct bfd_link_hash_table *
-+ (*_bfd_link_hash_table_create) (bfd *);
-+
-+ /* Release the memory associated with the linker hash table. */
-+ void (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *);
-+
-+ /* Add symbols from this object file into the hash table. */
-+ bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
-+
-+ /* Indicate that we are only retrieving symbol values from this section. */
-+ void (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);
-+
-+ /* Do a link based on the link_order structures attached to each
-+ section of the BFD. */
-+ bfd_boolean (*_bfd_final_link) (bfd *, struct bfd_link_info *);
-+
-+ /* Should this section be split up into smaller pieces during linking. */
-+ bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
-+
-+ /* Remove sections that are not referenced from the output. */
-+ bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
-+
-+ /* Attempt to merge SEC_MERGE sections. */
-+ bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
-+
-+ /* Is this section a member of a group? */
-+ bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
-+
-+ /* Discard members of a group. */
-+ bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
-+
-+ /* Check if SEC has been already linked during a reloceatable or
-+ final link. */
-+ void (*_section_already_linked) (bfd *, struct bfd_section *,
-+ struct bfd_link_info *);
-+
-+ /* Routines to handle dynamic symbols and relocs. */
-+#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
-+ NAME##_get_dynamic_symtab_upper_bound, \
-+ NAME##_canonicalize_dynamic_symtab, \
-+ NAME##_get_synthetic_symtab, \
-+ NAME##_get_dynamic_reloc_upper_bound, \
-+ NAME##_canonicalize_dynamic_reloc
-+
-+ /* Get the amount of memory required to hold the dynamic symbols. */
-+ long (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);
-+ /* Read in the dynamic symbols. */
-+ long (*_bfd_canonicalize_dynamic_symtab)
-+ (bfd *, struct bfd_symbol **);
-+ /* Create synthetized symbols. */
-+ long (*_bfd_get_synthetic_symtab)
-+ (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
-+ struct bfd_symbol **);
-+ /* Get the amount of memory required to hold the dynamic relocs. */
-+ long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
-+ /* Read in the dynamic relocs. */
-+ long (*_bfd_canonicalize_dynamic_reloc)
-+ (bfd *, arelent **, struct bfd_symbol **);
-+
-+ /* Opposite endian version of this target. */
-+ const struct bfd_target * alternative_target;
-+
-+ /* Data for use by back-end routines, which isn't
-+ generic enough to belong in this structure. */
-+ const void *backend_data;
-+
-+} bfd_target;
-+
-+bfd_boolean bfd_set_default_target (const char *name);
-+
-+const bfd_target *bfd_find_target (const char *target_name, bfd *abfd);
-+
-+const char ** bfd_target_list (void);
-+
-+const bfd_target *bfd_search_for_target
-+ (int (*search_func) (const bfd_target *, void *),
-+ void *);
-+
-+/* Extracted from format.c. */
-+bfd_boolean bfd_check_format (bfd *abfd, bfd_format format);
-+
-+bfd_boolean bfd_check_format_matches
-+ (bfd *abfd, bfd_format format, char ***matching);
-+
-+bfd_boolean bfd_set_format (bfd *abfd, bfd_format format);
-+
-+const char *bfd_format_string (bfd_format format);
-+
-+/* Extracted from linker.c. */
-+bfd_boolean bfd_link_split_section (bfd *abfd, asection *sec);
-+
-+#define bfd_link_split_section(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_link_split_section, (abfd, sec))
-+
-+void bfd_section_already_linked (bfd *abfd, asection *sec,
-+ struct bfd_link_info *info);
-+
-+#define bfd_section_already_linked(abfd, sec, info) \
-+ BFD_SEND (abfd, _section_already_linked, (abfd, sec, info))
-+
-+/* Extracted from simple.c. */
-+bfd_byte *bfd_simple_get_relocated_section_contents
-+ (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
---- /dev/null
-+++ b/bfd/bfd_stdint.h
-@@ -0,0 +1,47 @@
-+/* generated for gcc (GCC) 4.2.4 (Ubuntu 4.2.4-3ubuntu4) */
-+
-+#ifndef GCC_GENERATED_STDINT_H
-+#define GCC_GENERATED_STDINT_H 1
-+
-+#include <sys/types.h>
-+#include <stdint.h>
-+/* glibc uses these symbols as guards to prevent redefinitions. */
-+#ifdef __int8_t_defined
-+#define _INT8_T
-+#define _INT16_T
-+#define _INT32_T
-+#endif
-+#ifdef __uint32_t_defined
-+#define _UINT32_T
-+#endif
-+
-+
-+/* Some systems have guard macros to prevent redefinitions, define them. */
-+#ifndef _INT8_T
-+#define _INT8_T
-+#endif
-+#ifndef _INT16_T
-+#define _INT16_T
-+#endif
-+#ifndef _INT32_T
-+#define _INT32_T
-+#endif
-+#ifndef _UINT8_T
-+#define _UINT8_T
-+#endif
-+#ifndef _UINT16_T
-+#define _UINT16_T
-+#endif
-+#ifndef _UINT32_T
-+#define _UINT32_T
-+#endif
-+
-+/* system headers have good uint64_t and int64_t */
-+#ifndef _INT64_T
-+#define _INT64_T
-+#endif
-+#ifndef _UINT64_T
-+#define _UINT64_T
-+#endif
-+
-+#endif /* GCC_GENERATED_STDINT_H */
---- a/bfd/configure
-+++ b/bfd/configure
-@@ -2994,7 +2994,7 @@ fi
-
- # Define the identity of the package.
- PACKAGE=bfd
-- VERSION=2.18
-+ VERSION=2.18.atmel.1.0.1.avr32linux.1
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -19041,6 +19041,7 @@ do
- bfd_efi_app_ia64_vec) tb="$tb efi-app-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
- bfd_elf32_am33lin_vec) tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
- 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" ;;
---- /dev/null
-+++ b/bfd/doc/bfd.h
-@@ -0,0 +1,5493 @@
-+/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
-+ generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c",
-+ "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c",
-+ "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c",
-+ "linker.c" and "simple.c".
-+ Run "make headers" in your build bfd/ to regenerate. */
-+
-+/* Main header file for the bfd library -- portable access to object files.
-+
-+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+ Free Software Foundation, Inc.
-+
-+ Contributed by Cygnus Support.
-+
-+ 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 3 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. */
-+
-+#ifndef __BFD_H_SEEN__
-+#define __BFD_H_SEEN__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "ansidecl.h"
-+#include "symcat.h"
-+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
-+#ifndef SABER
-+/* This hack is to avoid a problem with some strict ANSI C preprocessors.
-+ The problem is, "32_" is not a valid preprocessing token, and we don't
-+ want extra underscores (e.g., "nlm_32_"). The XCONCAT2 macro will
-+ cause the inner CONCAT2 macros to be evaluated first, producing
-+ still-valid pp-tokens. Then the final concatenation can be done. */
-+#undef CONCAT4
-+#define CONCAT4(a,b,c,d) XCONCAT2(CONCAT2(a,b),CONCAT2(c,d))
-+#endif
-+#endif
-+
-+/* This is a utility macro to handle the situation where the code
-+ wants to place a constant string into the code, followed by a
-+ comma and then the length of the string. Doing this by hand
-+ is error prone, so using this macro is safer. The macro will
-+ also safely handle the case where a NULL is passed as the arg. */
-+#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0)
-+/* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
-+ to create the arguments to another macro, since the preprocessor
-+ will mis-count the number of arguments to the outer macro (by not
-+ evaluating STRING_COMMA_LEN and so missing the comma). This is a
-+ problem for example when trying to use STRING_COMMA_LEN to build
-+ the arguments to the strncmp() macro. Hence this alternative
-+ definition of strncmp is provided here.
-+
-+ Note - these macros do NOT work if STR2 is not a constant string. */
-+#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
-+ /* strcpy() can have a similar problem, but since we know we are
-+ copying a constant string, we can use memcpy which will be faster
-+ since there is no need to check for a NUL byte inside STR. We
-+ can also save time if we do not need to copy the terminating NUL. */
-+#define LITMEMCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2) - 1)
-+#define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
-+
-+
-+/* The word size used by BFD on the host. This may be 64 with a 32
-+ bit target if the host is 64 bit, or if other 64 bit targets have
-+ been selected with --enable-targets, or if --enable-64-bit-bfd. */
-+#define BFD_ARCH_SIZE @wordsize@
-+
-+/* The word size of the default bfd target. */
-+#define BFD_DEFAULT_TARGET_SIZE @bfd_default_target_size@
-+
-+#define BFD_HOST_64BIT_LONG @BFD_HOST_64BIT_LONG@
-+#define BFD_HOST_64BIT_LONG_LONG @BFD_HOST_64BIT_LONG_LONG@
-+#define BFD_HOST_LONG_LONG @BFD_HOST_LONG_LONG@
-+#if @BFD_HOST_64_BIT_DEFINED@
-+#define BFD_HOST_64_BIT @BFD_HOST_64_BIT@
-+#define BFD_HOST_U_64_BIT @BFD_HOST_U_64_BIT@
-+typedef BFD_HOST_64_BIT bfd_int64_t;
-+typedef BFD_HOST_U_64_BIT bfd_uint64_t;
-+#endif
-+
-+#if BFD_ARCH_SIZE >= 64
-+#define BFD64
-+#endif
-+
-+#ifndef INLINE
-+#if __GNUC__ >= 2
-+#define INLINE __inline__
-+#else
-+#define INLINE
-+#endif
-+#endif
-+
-+/* Declaring a type wide enough to hold a host long and a host pointer. */
-+#define BFD_HOSTPTR_T @BFD_HOSTPTR_T@
-+typedef BFD_HOSTPTR_T bfd_hostptr_t;
-+
-+/* Forward declaration. */
-+typedef struct bfd bfd;
-+
-+/* Boolean type used in bfd. Too many systems define their own
-+ versions of "boolean" for us to safely typedef a "boolean" of
-+ our own. Using an enum for "bfd_boolean" has its own set of
-+ problems, with strange looking casts required to avoid warnings
-+ on some older compilers. Thus we just use an int.
-+
-+ General rule: Functions which are bfd_boolean return TRUE on
-+ success and FALSE on failure (unless they're a predicate). */
-+
-+typedef int bfd_boolean;
-+#undef FALSE
-+#undef TRUE
-+#define FALSE 0
-+#define TRUE 1
-+
-+#ifdef BFD64
-+
-+#ifndef BFD_HOST_64_BIT
-+ #error No 64 bit integer type available
-+#endif /* ! defined (BFD_HOST_64_BIT) */
-+
-+typedef BFD_HOST_U_64_BIT bfd_vma;
-+typedef BFD_HOST_64_BIT bfd_signed_vma;
-+typedef BFD_HOST_U_64_BIT bfd_size_type;
-+typedef BFD_HOST_U_64_BIT symvalue;
-+
-+#ifndef fprintf_vma
-+#if BFD_HOST_64BIT_LONG
-+#define sprintf_vma(s,x) sprintf (s, "%016lx", x)
-+#define fprintf_vma(f,x) fprintf (f, "%016lx", x)
-+#elif BFD_HOST_64BIT_LONG_LONG
-+#define sprintf_vma(s,x) sprintf (s, "%016llx", x)
-+#define fprintf_vma(f,x) fprintf (f, "%016llx", x)
-+#else
-+#define _bfd_int64_low(x) ((unsigned long) (((x) & 0xffffffff)))
-+#define _bfd_int64_high(x) ((unsigned long) (((x) >> 32) & 0xffffffff))
-+#define fprintf_vma(s,x) \
-+ fprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-+#define sprintf_vma(s,x) \
-+ sprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-+#endif
-+#endif
-+
-+#else /* not BFD64 */
-+
-+/* Represent a target address. Also used as a generic unsigned type
-+ which is guaranteed to be big enough to hold any arithmetic types
-+ we need to deal with. */
-+typedef unsigned long bfd_vma;
-+
-+/* A generic signed type which is guaranteed to be big enough to hold any
-+ arithmetic types we need to deal with. Can be assumed to be compatible
-+ with bfd_vma in the same way that signed and unsigned ints are compatible
-+ (as parameters, in assignment, etc). */
-+typedef long bfd_signed_vma;
-+
-+typedef unsigned long symvalue;
-+typedef unsigned long bfd_size_type;
-+
-+/* Print a bfd_vma x on stream s. */
-+#define fprintf_vma(s,x) fprintf (s, "%08lx", x)
-+#define sprintf_vma(s,x) sprintf (s, "%08lx", x)
-+
-+#endif /* not BFD64 */
-+
-+#define HALF_BFD_SIZE_TYPE \
-+ (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2))
-+
-+#ifndef BFD_HOST_64_BIT
-+/* Fall back on a 32 bit type. The idea is to make these types always
-+ available for function return types, but in the case that
-+ BFD_HOST_64_BIT is undefined such a function should abort or
-+ otherwise signal an error. */
-+typedef bfd_signed_vma bfd_int64_t;
-+typedef bfd_vma bfd_uint64_t;
-+#endif
-+
-+/* An offset into a file. BFD always uses the largest possible offset
-+ based on the build time availability of fseek, fseeko, or fseeko64. */
-+typedef @bfd_file_ptr@ file_ptr;
-+typedef unsigned @bfd_file_ptr@ ufile_ptr;
-+
-+extern void bfd_sprintf_vma (bfd *, char *, bfd_vma);
-+extern void bfd_fprintf_vma (bfd *, void *, bfd_vma);
-+
-+#define printf_vma(x) fprintf_vma(stdout,x)
-+#define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
-+
-+typedef unsigned int flagword; /* 32 bits of flags */
-+typedef unsigned char bfd_byte;
-+
-+/* File formats. */
-+
-+typedef enum bfd_format
-+{
-+ bfd_unknown = 0, /* File format is unknown. */
-+ bfd_object, /* Linker/assembler/compiler output. */
-+ bfd_archive, /* Object archive file. */
-+ bfd_core, /* Core dump. */
-+ bfd_type_end /* Marks the end; don't use it! */
-+}
-+bfd_format;
-+
-+/* Values that may appear in the flags field of a BFD. These also
-+ appear in the object_flags field of the bfd_target structure, where
-+ they indicate the set of flags used by that backend (not all flags
-+ are meaningful for all object file formats) (FIXME: at the moment,
-+ the object_flags values have mostly just been copied from backend
-+ to another, and are not necessarily correct). */
-+
-+/* No flags. */
-+#define BFD_NO_FLAGS 0x00
-+
-+/* BFD contains relocation entries. */
-+#define HAS_RELOC 0x01
-+
-+/* BFD is directly executable. */
-+#define EXEC_P 0x02
-+
-+/* BFD has line number information (basically used for F_LNNO in a
-+ COFF header). */
-+#define HAS_LINENO 0x04
-+
-+/* BFD has debugging information. */
-+#define HAS_DEBUG 0x08
-+
-+/* BFD has symbols. */
-+#define HAS_SYMS 0x10
-+
-+/* BFD has local symbols (basically used for F_LSYMS in a COFF
-+ header). */
-+#define HAS_LOCALS 0x20
-+
-+/* BFD is a dynamic object. */
-+#define DYNAMIC 0x40
-+
-+/* Text section is write protected (if D_PAGED is not set, this is
-+ like an a.out NMAGIC file) (the linker sets this by default, but
-+ clears it for -r or -N). */
-+#define WP_TEXT 0x80
-+
-+/* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
-+ linker sets this by default, but clears it for -r or -n or -N). */
-+#define D_PAGED 0x100
-+
-+/* BFD is relaxable (this means that bfd_relax_section may be able to
-+ do something) (sometimes bfd_relax_section can do something even if
-+ this is not set). */
-+#define BFD_IS_RELAXABLE 0x200
-+
-+/* This may be set before writing out a BFD to request using a
-+ traditional format. For example, this is used to request that when
-+ writing out an a.out object the symbols not be hashed to eliminate
-+ duplicates. */
-+#define BFD_TRADITIONAL_FORMAT 0x400
-+
-+/* This flag indicates that the BFD contents are actually cached in
-+ memory. If this is set, iostream points to a bfd_in_memory struct. */
-+#define BFD_IN_MEMORY 0x800
-+
-+/* The sections in this BFD specify a memory page. */
-+#define HAS_LOAD_PAGE 0x1000
-+
-+/* This BFD has been created by the linker and doesn't correspond
-+ to any input file. */
-+#define BFD_LINKER_CREATED 0x2000
-+
-+/* Symbols and relocation. */
-+
-+/* A count of carsyms (canonical archive symbols). */
-+typedef unsigned long symindex;
-+
-+/* How to perform a relocation. */
-+typedef const struct reloc_howto_struct reloc_howto_type;
-+
-+#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
-+
-+/* General purpose part of a symbol X;
-+ target specific parts are in libcoff.h, libaout.h, etc. */
-+
-+#define bfd_get_section(x) ((x)->section)
-+#define bfd_get_output_section(x) ((x)->section->output_section)
-+#define bfd_set_section(x,y) ((x)->section) = (y)
-+#define bfd_asymbol_base(x) ((x)->section->vma)
-+#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
-+#define bfd_asymbol_name(x) ((x)->name)
-+/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
-+#define bfd_asymbol_bfd(x) ((x)->the_bfd)
-+#define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
-+
-+/* A canonical archive symbol. */
-+/* This is a type pun with struct ranlib on purpose! */
-+typedef struct carsym
-+{
-+ char *name;
-+ file_ptr file_offset; /* Look here to find the file. */
-+}
-+carsym; /* To make these you call a carsymogen. */
-+
-+/* Used in generating armaps (archive tables of contents).
-+ Perhaps just a forward definition would do? */
-+struct orl /* Output ranlib. */
-+{
-+ char **name; /* Symbol name. */
-+ union
-+ {
-+ file_ptr pos;
-+ bfd *abfd;
-+ } u; /* bfd* or file position. */
-+ int namidx; /* Index into string table. */
-+};
-+
-+/* Linenumber stuff. */
-+typedef struct lineno_cache_entry
-+{
-+ unsigned int line_number; /* Linenumber from start of function. */
-+ union
-+ {
-+ struct bfd_symbol *sym; /* Function name. */
-+ bfd_vma offset; /* Offset into section. */
-+ } u;
-+}
-+alent;
-+
-+/* Object and core file sections. */
-+
-+#define align_power(addr, align) \
-+ (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
-+
-+typedef struct bfd_section *sec_ptr;
-+
-+#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
-+#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
-+#define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
-+#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
-+#define bfd_section_name(bfd, ptr) ((ptr)->name)
-+#define bfd_section_size(bfd, ptr) ((ptr)->size)
-+#define bfd_get_section_size(ptr) ((ptr)->size)
-+#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
-+#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
-+#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
-+#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
-+#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
-+
-+#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
-+
-+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
-+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
-+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
-+/* Find the address one past the end of SEC. */
-+#define bfd_get_section_limit(bfd, sec) \
-+ (((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
-+ / bfd_octets_per_byte (bfd))
-+
-+/* Return TRUE if section has been discarded. */
-+#define elf_discarded_section(sec) \
-+ (!bfd_is_abs_section (sec) \
-+ && bfd_is_abs_section ((sec)->output_section) \
-+ && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE \
-+ && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
-+
-+/* Forward define. */
-+struct stat;
-+
-+typedef enum bfd_print_symbol
-+{
-+ bfd_print_symbol_name,
-+ bfd_print_symbol_more,
-+ bfd_print_symbol_all
-+} bfd_print_symbol_type;
-+
-+/* Information about a symbol that nm needs. */
-+
-+typedef struct _symbol_info
-+{
-+ symvalue value;
-+ char type;
-+ const char *name; /* Symbol name. */
-+ unsigned char stab_type; /* Stab type. */
-+ char stab_other; /* Stab other. */
-+ short stab_desc; /* Stab desc. */
-+ const char *stab_name; /* String for stab type. */
-+} symbol_info;
-+
-+/* Get the name of a stabs type code. */
-+
-+extern const char *bfd_get_stab_name (int);
-+
-+/* Hash table routines. There is no way to free up a hash table. */
-+
-+/* An element in the hash table. Most uses will actually use a larger
-+ structure, and an instance of this will be the first field. */
-+
-+struct bfd_hash_entry
-+{
-+ /* Next entry for this hash code. */
-+ struct bfd_hash_entry *next;
-+ /* String being hashed. */
-+ const char *string;
-+ /* Hash code. This is the full hash code, not the index into the
-+ table. */
-+ unsigned long hash;
-+};
-+
-+/* A hash table. */
-+
-+struct bfd_hash_table
-+{
-+ /* The hash array. */
-+ struct bfd_hash_entry **table;
-+ /* A function used to create new elements in the hash table. The
-+ first entry is itself a pointer to an element. When this
-+ function is first invoked, this pointer will be NULL. However,
-+ having the pointer permits a hierarchy of method functions to be
-+ built each of which calls the function in the superclass. Thus
-+ each function should be written to allocate a new block of memory
-+ only if the argument is NULL. */
-+ struct bfd_hash_entry *(*newfunc)
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+ /* An objalloc for this hash table. This is a struct objalloc *,
-+ but we use void * to avoid requiring the inclusion of objalloc.h. */
-+ void *memory;
-+ /* The number of slots in the hash table. */
-+ unsigned int size;
-+ /* The number of entries in the hash table. */
-+ unsigned int count;
-+ /* The size of elements. */
-+ unsigned int entsize;
-+ /* If non-zero, don't grow the hash table. */
-+ unsigned int frozen:1;
-+};
-+
-+/* Initialize a hash table. */
-+extern bfd_boolean bfd_hash_table_init
-+ (struct bfd_hash_table *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int);
-+
-+/* Initialize a hash table specifying a size. */
-+extern bfd_boolean bfd_hash_table_init_n
-+ (struct bfd_hash_table *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int, unsigned int);
-+
-+/* Free up a hash table. */
-+extern void bfd_hash_table_free
-+ (struct bfd_hash_table *);
-+
-+/* Look up a string in a hash table. If CREATE is TRUE, a new entry
-+ will be created for this string if one does not already exist. The
-+ COPY argument must be TRUE if this routine should copy the string
-+ into newly allocated memory when adding an entry. */
-+extern struct bfd_hash_entry *bfd_hash_lookup
-+ (struct bfd_hash_table *, const char *, bfd_boolean create,
-+ bfd_boolean copy);
-+
-+/* Replace an entry in a hash table. */
-+extern void bfd_hash_replace
-+ (struct bfd_hash_table *, struct bfd_hash_entry *old,
-+ struct bfd_hash_entry *nw);
-+
-+/* Base method for creating a hash table entry. */
-+extern struct bfd_hash_entry *bfd_hash_newfunc
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+
-+/* Grab some space for a hash table entry. */
-+extern void *bfd_hash_allocate
-+ (struct bfd_hash_table *, unsigned int);
-+
-+/* Traverse a hash table in a random order, calling a function on each
-+ element. If the function returns FALSE, the traversal stops. The
-+ INFO argument is passed to the function. */
-+extern void bfd_hash_traverse
-+ (struct bfd_hash_table *,
-+ bfd_boolean (*) (struct bfd_hash_entry *, void *),
-+ void *info);
-+
-+/* Allows the default size of a hash table to be configured. New hash
-+ tables allocated using bfd_hash_table_init will be created with
-+ this size. */
-+extern void bfd_hash_set_default_size (bfd_size_type);
-+
-+/* This structure is used to keep track of stabs in sections
-+ information while linking. */
-+
-+struct stab_info
-+{
-+ /* A hash table used to hold stabs strings. */
-+ struct bfd_strtab_hash *strings;
-+ /* The header file hash table. */
-+ struct bfd_hash_table includes;
-+ /* The first .stabstr section. */
-+ struct bfd_section *stabstr;
-+};
-+
-+#define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table
-+
-+/* User program access to BFD facilities. */
-+
-+/* Direct I/O routines, for programs which know more about the object
-+ file than BFD does. Use higher level routines if possible. */
-+
-+extern bfd_size_type bfd_bread (void *, bfd_size_type, bfd *);
-+extern bfd_size_type bfd_bwrite (const void *, bfd_size_type, bfd *);
-+extern int bfd_seek (bfd *, file_ptr, int);
-+extern file_ptr bfd_tell (bfd *);
-+extern int bfd_flush (bfd *);
-+extern int bfd_stat (bfd *, struct stat *);
-+
-+/* Deprecated old routines. */
-+#if __GNUC__
-+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__), \
-+ bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
-+ bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#else
-+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
-+ bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
-+ (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
-+ bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-+#endif
-+extern void warn_deprecated (const char *, const char *, int, const char *);
-+
-+/* Cast from const char * to char * so that caller can assign to
-+ a char * without a warning. */
-+#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
-+#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
-+#define bfd_get_format(abfd) ((abfd)->format)
-+#define bfd_get_target(abfd) ((abfd)->xvec->name)
-+#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
-+#define bfd_family_coff(abfd) \
-+ (bfd_get_flavour (abfd) == bfd_target_coff_flavour || \
-+ bfd_get_flavour (abfd) == bfd_target_xcoff_flavour)
-+#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
-+#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
-+#define bfd_header_big_endian(abfd) \
-+ ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
-+#define bfd_header_little_endian(abfd) \
-+ ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
-+#define bfd_get_file_flags(abfd) ((abfd)->flags)
-+#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
-+#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-+#define bfd_my_archive(abfd) ((abfd)->my_archive)
-+#define bfd_has_map(abfd) ((abfd)->has_armap)
-+
-+#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
-+#define bfd_usrdata(abfd) ((abfd)->usrdata)
-+
-+#define bfd_get_start_address(abfd) ((abfd)->start_address)
-+#define bfd_get_symcount(abfd) ((abfd)->symcount)
-+#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
-+#define bfd_count_sections(abfd) ((abfd)->section_count)
-+
-+#define bfd_get_dynamic_symcount(abfd) ((abfd)->dynsymcount)
-+
-+#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
-+
-+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
-+
-+extern bfd_boolean bfd_cache_close
-+ (bfd *abfd);
-+/* NB: This declaration should match the autogenerated one in libbfd.h. */
-+
-+extern bfd_boolean bfd_cache_close_all (void);
-+
-+extern bfd_boolean bfd_record_phdr
-+ (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
-+ bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **);
-+
-+/* Byte swapping routines. */
-+
-+bfd_uint64_t bfd_getb64 (const void *);
-+bfd_uint64_t bfd_getl64 (const void *);
-+bfd_int64_t bfd_getb_signed_64 (const void *);
-+bfd_int64_t bfd_getl_signed_64 (const void *);
-+bfd_vma bfd_getb32 (const void *);
-+bfd_vma bfd_getl32 (const void *);
-+bfd_signed_vma bfd_getb_signed_32 (const void *);
-+bfd_signed_vma bfd_getl_signed_32 (const void *);
-+bfd_vma bfd_getb16 (const void *);
-+bfd_vma bfd_getl16 (const void *);
-+bfd_signed_vma bfd_getb_signed_16 (const void *);
-+bfd_signed_vma bfd_getl_signed_16 (const void *);
-+void bfd_putb64 (bfd_uint64_t, void *);
-+void bfd_putl64 (bfd_uint64_t, void *);
-+void bfd_putb32 (bfd_vma, void *);
-+void bfd_putl32 (bfd_vma, void *);
-+void bfd_putb16 (bfd_vma, void *);
-+void bfd_putl16 (bfd_vma, void *);
-+
-+/* Byte swapping routines which take size and endiannes as arguments. */
-+
-+bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean);
-+void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean);
-+
-+extern bfd_boolean bfd_section_already_linked_table_init (void);
-+extern void bfd_section_already_linked_table_free (void);
-+
-+/* Externally visible ECOFF routines. */
-+
-+#if defined(__STDC__) || defined(ALMOST_STDC)
-+struct ecoff_debug_info;
-+struct ecoff_debug_swap;
-+struct ecoff_extr;
-+struct bfd_symbol;
-+struct bfd_link_info;
-+struct bfd_link_hash_entry;
-+struct bfd_elf_version_tree;
-+#endif
-+extern bfd_vma bfd_ecoff_get_gp_value
-+ (bfd * abfd);
-+extern bfd_boolean bfd_ecoff_set_gp_value
-+ (bfd *abfd, bfd_vma gp_value);
-+extern bfd_boolean bfd_ecoff_set_regmasks
-+ (bfd *abfd, unsigned long gprmask, unsigned long fprmask,
-+ unsigned long *cprmask);
-+extern void *bfd_ecoff_debug_init
-+ (bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
-+extern void bfd_ecoff_debug_free
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_accumulate
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-+ struct ecoff_debug_info *input_debug,
-+ const struct ecoff_debug_swap *input_swap, struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_accumulate_other
-+ (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-+ const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-+ struct bfd_link_info *);
-+extern bfd_boolean bfd_ecoff_debug_externals
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, bfd_boolean relocatable,
-+ bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *),
-+ void (*set_index) (struct bfd_symbol *, bfd_size_type));
-+extern bfd_boolean bfd_ecoff_debug_one_external
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, const char *name,
-+ struct ecoff_extr *esym);
-+extern bfd_size_type bfd_ecoff_debug_size
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap);
-+extern bfd_boolean bfd_ecoff_write_debug
-+ (bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap, file_ptr where);
-+extern bfd_boolean bfd_ecoff_write_accumulated_debug
-+ (void *handle, bfd *abfd, struct ecoff_debug_info *debug,
-+ const struct ecoff_debug_swap *swap,
-+ struct bfd_link_info *info, file_ptr where);
-+
-+/* Externally visible ELF routines. */
-+
-+struct bfd_link_needed_list
-+{
-+ struct bfd_link_needed_list *next;
-+ bfd *by;
-+ const char *name;
-+};
-+
-+enum dynamic_lib_link_class {
-+ DYN_NORMAL = 0,
-+ DYN_AS_NEEDED = 1,
-+ DYN_DT_NEEDED = 2,
-+ DYN_NO_ADD_NEEDED = 4,
-+ DYN_NO_NEEDED = 8
-+};
-+
-+enum notice_asneeded_action {
-+ notice_as_needed,
-+ notice_not_needed,
-+ notice_needed
-+};
-+
-+extern bfd_boolean bfd_elf_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
-+ bfd_boolean);
-+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_elf_get_bfd_needed_list
-+ (bfd *, struct bfd_link_needed_list **);
-+extern bfd_boolean bfd_elf_size_dynamic_sections
-+ (bfd *, const char *, const char *, const char *, const char * const *,
-+ struct bfd_link_info *, struct bfd_section **,
-+ struct bfd_elf_version_tree *);
-+extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr
-+ (bfd *, struct bfd_link_info *);
-+extern void bfd_elf_set_dt_needed_name
-+ (bfd *, const char *);
-+extern const char *bfd_elf_get_dt_soname
-+ (bfd *);
-+extern void bfd_elf_set_dyn_lib_class
-+ (bfd *, enum dynamic_lib_link_class);
-+extern int bfd_elf_get_dyn_lib_class
-+ (bfd *);
-+extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_elf_discard_info
-+ (bfd *, struct bfd_link_info *);
-+extern unsigned int _bfd_elf_default_action_discarded
-+ (struct bfd_section *);
-+
-+/* Return an upper bound on the number of bytes required to store a
-+ copy of ABFD's program header table entries. Return -1 if an error
-+ occurs; bfd_get_error will return an appropriate code. */
-+extern long bfd_get_elf_phdr_upper_bound
-+ (bfd *abfd);
-+
-+/* Copy ABFD's program header table entries to *PHDRS. The entries
-+ will be stored as an array of Elf_Internal_Phdr structures, as
-+ defined in include/elf/internal.h. To find out how large the
-+ buffer needs to be, call bfd_get_elf_phdr_upper_bound.
-+
-+ Return the number of program header table entries read, or -1 if an
-+ error occurs; bfd_get_error will return an appropriate code. */
-+extern int bfd_get_elf_phdrs
-+ (bfd *abfd, void *phdrs);
-+
-+/* Create a new BFD as if by bfd_openr. Rather than opening a file,
-+ reconstruct an ELF file by reading the segments out of remote memory
-+ based on the ELF file header at EHDR_VMA and the ELF program headers it
-+ points to. If not null, *LOADBASEP is filled in with the difference
-+ between the VMAs from which the segments were read, and the VMAs the
-+ file headers (and hence BFD's idea of each section's VMA) put them at.
-+
-+ The function TARGET_READ_MEMORY is called to copy LEN bytes from the
-+ remote memory at target address VMA into the local buffer at MYADDR; it
-+ should return zero on success or an `errno' code on failure. TEMPL must
-+ be a BFD for an ELF target with the word size and byte order found in
-+ the remote memory. */
-+extern bfd *bfd_elf_bfd_from_remote_memory
-+ (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
-+ int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len));
-+
-+/* Return the arch_size field of an elf bfd, or -1 if not elf. */
-+extern int bfd_get_arch_size
-+ (bfd *);
-+
-+/* Return TRUE if address "naturally" sign extends, or -1 if not elf. */
-+extern int bfd_get_sign_extend_vma
-+ (bfd *);
-+
-+extern struct bfd_section *_bfd_elf_tls_setup
-+ (bfd *, struct bfd_link_info *);
-+
-+extern void _bfd_fix_excluded_sec_syms
-+ (bfd *, struct bfd_link_info *);
-+
-+extern unsigned bfd_m68k_mach_to_features (int);
-+
-+extern int bfd_m68k_features_to_mach (unsigned);
-+
-+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-+ char **);
-+
-+extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-+ char **);
-+
-+/* SunOS shared library support routines for the linker. */
-+
-+extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_sunos_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_sunos_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *, struct bfd_section **,
-+ struct bfd_section **, struct bfd_section **);
-+
-+/* Linux shared library support routines for the linker. */
-+
-+extern bfd_boolean bfd_i386linux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *);
-+
-+/* mmap hacks */
-+
-+struct _bfd_window_internal;
-+typedef struct _bfd_window_internal bfd_window_internal;
-+
-+typedef struct _bfd_window
-+{
-+ /* What the user asked for. */
-+ void *data;
-+ bfd_size_type size;
-+ /* The actual window used by BFD. Small user-requested read-only
-+ regions sharing a page may share a single window into the object
-+ file. Read-write versions shouldn't until I've fixed things to
-+ keep track of which portions have been claimed by the
-+ application; don't want to give the same region back when the
-+ application wants two writable copies! */
-+ struct _bfd_window_internal *i;
-+}
-+bfd_window;
-+
-+extern void bfd_init_window
-+ (bfd_window *);
-+extern void bfd_free_window
-+ (bfd_window *);
-+extern bfd_boolean bfd_get_file_window
-+ (bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean);
-+
-+/* XCOFF support routines for the linker. */
-+
-+extern bfd_boolean bfd_xcoff_link_record_set
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_size_type);
-+extern bfd_boolean bfd_xcoff_import_symbol
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_vma,
-+ const char *, const char *, const char *, unsigned int);
-+extern bfd_boolean bfd_xcoff_export_symbol
-+ (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
-+extern bfd_boolean bfd_xcoff_link_count_reloc
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_xcoff_record_link_assignment
-+ (bfd *, struct bfd_link_info *, const char *);
-+extern bfd_boolean bfd_xcoff_size_dynamic_sections
-+ (bfd *, struct bfd_link_info *, const char *, const char *,
-+ unsigned long, unsigned long, unsigned long, bfd_boolean,
-+ int, bfd_boolean, bfd_boolean, struct bfd_section **, bfd_boolean);
-+extern bfd_boolean bfd_xcoff_link_generate_rtinit
-+ (bfd *, const char *, const char *, bfd_boolean);
-+
-+/* XCOFF support routines for ar. */
-+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
-+ (bfd *, char *);
-+
-+/* Externally visible COFF routines. */
-+
-+#if defined(__STDC__) || defined(ALMOST_STDC)
-+struct internal_syment;
-+union internal_auxent;
-+#endif
-+
-+extern bfd_boolean bfd_coff_get_syment
-+ (bfd *, struct bfd_symbol *, struct internal_syment *);
-+
-+extern bfd_boolean bfd_coff_get_auxent
-+ (bfd *, struct bfd_symbol *, int, union internal_auxent *);
-+
-+extern bfd_boolean bfd_coff_set_symbol_class
-+ (bfd *, struct bfd_symbol *, unsigned int);
-+
-+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
-+ (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **);
-+
-+/* ARM VFP11 erratum workaround support. */
-+typedef enum
-+{
-+ BFD_ARM_VFP11_FIX_DEFAULT,
-+ BFD_ARM_VFP11_FIX_NONE,
-+ BFD_ARM_VFP11_FIX_SCALAR,
-+ BFD_ARM_VFP11_FIX_VECTOR
-+} bfd_arm_vfp11_fix;
-+
-+extern void bfd_elf32_arm_init_maps
-+ (bfd *);
-+
-+extern void bfd_elf32_arm_set_vfp11_fix
-+ (bfd *, struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_vfp11_erratum_scan
-+ (bfd *, struct bfd_link_info *);
-+
-+extern void bfd_elf32_arm_vfp11_fix_veneer_locations
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_arm_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_arm_process_before_allocation
-+ (bfd *, struct bfd_link_info *, int);
-+
-+extern bfd_boolean bfd_arm_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+/* PE ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_arm_pe_process_before_allocation
-+ (bfd *, struct bfd_link_info *, int);
-+
-+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ELF ARM Interworking support. Called from linker. */
-+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
-+ (struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_process_before_allocation
-+ (bfd *, struct bfd_link_info *);
-+
-+void bfd_elf32_arm_set_target_relocs
-+ (bfd *, struct bfd_link_info *, int, char *, int, int, bfd_arm_vfp11_fix,
-+ int, int);
-+
-+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
-+ (bfd *, struct bfd_link_info *);
-+
-+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
-+ (bfd *, struct bfd_link_info *);
-+
-+/* ELF ARM mapping symbol support */
-+#define BFD_ARM_SPECIAL_SYM_TYPE_MAP (1 << 0)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_TAG (1 << 1)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER (1 << 2)
-+#define BFD_ARM_SPECIAL_SYM_TYPE_ANY (~0)
-+extern bfd_boolean bfd_is_arm_special_symbol_name
-+ (const char * name, int type);
-+
-+extern void bfd_elf32_arm_set_byteswap_code (struct bfd_link_info *, int);
-+
-+/* ARM Note section processing. */
-+extern bfd_boolean bfd_arm_merge_machines
-+ (bfd *, bfd *);
-+
-+extern bfd_boolean bfd_arm_update_notes
-+ (bfd *, const char *);
-+
-+extern unsigned int bfd_arm_get_mach_from_notes
-+ (bfd *, const char *);
-+
-+/* TI COFF load page support. */
-+extern void bfd_ticoff_set_section_load_page
-+ (struct bfd_section *, int);
-+
-+extern int bfd_ticoff_get_section_load_page
-+ (struct bfd_section *);
-+
-+/* H8/300 functions. */
-+extern bfd_vma bfd_h8300_pad_address
-+ (bfd *, bfd_vma);
-+
-+/* IA64 Itanium code generation. Called from linker. */
-+extern void bfd_elf32_ia64_after_parse
-+ (int);
-+
-+extern void bfd_elf64_ia64_after_parse
-+ (int);
-+
-+/* This structure is used for a comdat section, as in PE. A comdat
-+ section is associated with a particular symbol. When the linker
-+ sees a comdat section, it keeps only one of the sections with a
-+ given name and associated with a given symbol. */
-+
-+struct coff_comdat_info
-+{
-+ /* The name of the symbol associated with a comdat section. */
-+ const char *name;
-+
-+ /* The local symbol table index of the symbol associated with a
-+ comdat section. This is only meaningful to the object file format
-+ specific code; it is not an index into the list returned by
-+ bfd_canonicalize_symtab. */
-+ long symbol;
-+};
-+
-+extern struct coff_comdat_info *bfd_coff_get_comdat_section
-+ (bfd *, struct bfd_section *);
-+
-+/* Extracted from init.c. */
-+void bfd_init (void);
-+
-+/* Extracted from opncls.c. */
-+bfd *bfd_fopen (const char *filename, const char *target,
-+ const char *mode, int fd);
-+
-+bfd *bfd_openr (const char *filename, const char *target);
-+
-+bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
-+
-+bfd *bfd_openstreamr (const char *, const char *, void *);
-+
-+bfd *bfd_openr_iovec (const char *filename, const char *target,
-+ void *(*open) (struct bfd *nbfd,
-+ void *open_closure),
-+ void *open_closure,
-+ file_ptr (*pread) (struct bfd *nbfd,
-+ void *stream,
-+ void *buf,
-+ file_ptr nbytes,
-+ file_ptr offset),
-+ int (*close) (struct bfd *nbfd,
-+ void *stream),
-+ int (*stat) (struct bfd *abfd,
-+ void *stream,
-+ struct stat *sb));
-+
-+bfd *bfd_openw (const char *filename, const char *target);
-+
-+bfd_boolean bfd_close (bfd *abfd);
-+
-+bfd_boolean bfd_close_all_done (bfd *);
-+
-+bfd *bfd_create (const char *filename, bfd *templ);
-+
-+bfd_boolean bfd_make_writable (bfd *abfd);
-+
-+bfd_boolean bfd_make_readable (bfd *abfd);
-+
-+unsigned long bfd_calc_gnu_debuglink_crc32
-+ (unsigned long crc, const unsigned char *buf, bfd_size_type len);
-+
-+char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir);
-+
-+struct bfd_section *bfd_create_gnu_debuglink_section
-+ (bfd *abfd, const char *filename);
-+
-+bfd_boolean bfd_fill_in_gnu_debuglink_section
-+ (bfd *abfd, struct bfd_section *sect, const char *filename);
-+
-+/* Extracted from libbfd.c. */
-+
-+/* Byte swapping macros for user section data. */
-+
-+#define bfd_put_8(abfd, val, ptr) \
-+ ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
-+#define bfd_put_signed_8 \
-+ bfd_put_8
-+#define bfd_get_8(abfd, ptr) \
-+ (*(unsigned char *) (ptr) & 0xff)
-+#define bfd_get_signed_8(abfd, ptr) \
-+ (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
-+
-+#define bfd_put_16(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
-+#define bfd_put_signed_16 \
-+ bfd_put_16
-+#define bfd_get_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx16, (ptr))
-+#define bfd_get_signed_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
-+
-+#define bfd_put_32(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
-+#define bfd_put_signed_32 \
-+ bfd_put_32
-+#define bfd_get_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx32, (ptr))
-+#define bfd_get_signed_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_32, (ptr))
-+
-+#define bfd_put_64(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_putx64, ((val), (ptr)))
-+#define bfd_put_signed_64 \
-+ bfd_put_64
-+#define bfd_get_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx64, (ptr))
-+#define bfd_get_signed_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
-+
-+#define bfd_get(bits, abfd, ptr) \
-+ ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr) \
-+ : (bits) == 16 ? bfd_get_16 (abfd, ptr) \
-+ : (bits) == 32 ? bfd_get_32 (abfd, ptr) \
-+ : (bits) == 64 ? bfd_get_64 (abfd, ptr) \
-+ : (abort (), (bfd_vma) - 1))
-+
-+#define bfd_put(bits, abfd, val, ptr) \
-+ ((bits) == 8 ? bfd_put_8 (abfd, val, ptr) \
-+ : (bits) == 16 ? bfd_put_16 (abfd, val, ptr) \
-+ : (bits) == 32 ? bfd_put_32 (abfd, val, ptr) \
-+ : (bits) == 64 ? bfd_put_64 (abfd, val, ptr) \
-+ : (abort (), (void) 0))
-+
-+
-+/* Byte swapping macros for file header data. */
-+
-+#define bfd_h_put_8(abfd, val, ptr) \
-+ bfd_put_8 (abfd, val, ptr)
-+#define bfd_h_put_signed_8(abfd, val, ptr) \
-+ bfd_put_8 (abfd, val, ptr)
-+#define bfd_h_get_8(abfd, ptr) \
-+ bfd_get_8 (abfd, ptr)
-+#define bfd_h_get_signed_8(abfd, ptr) \
-+ bfd_get_signed_8 (abfd, ptr)
-+
-+#define bfd_h_put_16(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx16, (val, ptr))
-+#define bfd_h_put_signed_16 \
-+ bfd_h_put_16
-+#define bfd_h_get_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx16, (ptr))
-+#define bfd_h_get_signed_16(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_16, (ptr))
-+
-+#define bfd_h_put_32(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx32, (val, ptr))
-+#define bfd_h_put_signed_32 \
-+ bfd_h_put_32
-+#define bfd_h_get_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx32, (ptr))
-+#define bfd_h_get_signed_32(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_32, (ptr))
-+
-+#define bfd_h_put_64(abfd, val, ptr) \
-+ BFD_SEND (abfd, bfd_h_putx64, (val, ptr))
-+#define bfd_h_put_signed_64 \
-+ bfd_h_put_64
-+#define bfd_h_get_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx64, (ptr))
-+#define bfd_h_get_signed_64(abfd, ptr) \
-+ BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
-+
-+/* Aliases for the above, which should eventually go away. */
-+
-+#define H_PUT_64 bfd_h_put_64
-+#define H_PUT_32 bfd_h_put_32
-+#define H_PUT_16 bfd_h_put_16
-+#define H_PUT_8 bfd_h_put_8
-+#define H_PUT_S64 bfd_h_put_signed_64
-+#define H_PUT_S32 bfd_h_put_signed_32
-+#define H_PUT_S16 bfd_h_put_signed_16
-+#define H_PUT_S8 bfd_h_put_signed_8
-+#define H_GET_64 bfd_h_get_64
-+#define H_GET_32 bfd_h_get_32
-+#define H_GET_16 bfd_h_get_16
-+#define H_GET_8 bfd_h_get_8
-+#define H_GET_S64 bfd_h_get_signed_64
-+#define H_GET_S32 bfd_h_get_signed_32
-+#define H_GET_S16 bfd_h_get_signed_16
-+#define H_GET_S8 bfd_h_get_signed_8
-+
-+
-+/* Extracted from bfdio.c. */
-+long bfd_get_mtime (bfd *abfd);
-+
-+file_ptr bfd_get_size (bfd *abfd);
-+
-+/* Extracted from bfdwin.c. */
-+/* Extracted from section.c. */
-+typedef struct bfd_section
-+{
-+ /* The name of the section; the name isn't a copy, the pointer is
-+ the same as that passed to bfd_make_section. */
-+ const char *name;
-+
-+ /* A unique sequence number. */
-+ int id;
-+
-+ /* Which section in the bfd; 0..n-1 as sections are created in a bfd. */
-+ int index;
-+
-+ /* The next section in the list belonging to the BFD, or NULL. */
-+ struct bfd_section *next;
-+
-+ /* The previous section in the list belonging to the BFD, or NULL. */
-+ struct bfd_section *prev;
-+
-+ /* The field flags contains attributes of the section. Some
-+ flags are read in from the object file, and some are
-+ synthesized from other information. */
-+ flagword flags;
-+
-+#define SEC_NO_FLAGS 0x000
-+
-+ /* Tells the OS to allocate space for this section when loading.
-+ This is clear for a section containing debug information only. */
-+#define SEC_ALLOC 0x001
-+
-+ /* Tells the OS to load the section from the file when loading.
-+ This is clear for a .bss section. */
-+#define SEC_LOAD 0x002
-+
-+ /* The section contains data still to be relocated, so there is
-+ some relocation information too. */
-+#define SEC_RELOC 0x004
-+
-+ /* A signal to the OS that the section contains read only data. */
-+#define SEC_READONLY 0x008
-+
-+ /* The section contains code only. */
-+#define SEC_CODE 0x010
-+
-+ /* The section contains data only. */
-+#define SEC_DATA 0x020
-+
-+ /* The section will reside in ROM. */
-+#define SEC_ROM 0x040
-+
-+ /* The section contains constructor information. This section
-+ type is used by the linker to create lists of constructors and
-+ destructors used by <<g++>>. When a back end sees a symbol
-+ which should be used in a constructor list, it creates a new
-+ section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
-+ the symbol to it, and builds a relocation. To build the lists
-+ of constructors, all the linker has to do is catenate all the
-+ sections called <<__CTOR_LIST__>> and relocate the data
-+ contained within - exactly the operations it would peform on
-+ standard data. */
-+#define SEC_CONSTRUCTOR 0x080
-+
-+ /* The section has contents - a data section could be
-+ <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
-+ <<SEC_HAS_CONTENTS>> */
-+#define SEC_HAS_CONTENTS 0x100
-+
-+ /* An instruction to the linker to not output the section
-+ even if it has information which would normally be written. */
-+#define SEC_NEVER_LOAD 0x200
-+
-+ /* The section contains thread local data. */
-+#define SEC_THREAD_LOCAL 0x400
-+
-+ /* The section has GOT references. This flag is only for the
-+ linker, and is currently only used by the elf32-hppa back end.
-+ It will be set if global offset table references were detected
-+ in this section, which indicate to the linker that the section
-+ contains PIC code, and must be handled specially when doing a
-+ static link. */
-+#define SEC_HAS_GOT_REF 0x800
-+
-+ /* The section contains common symbols (symbols may be defined
-+ multiple times, the value of a symbol is the amount of
-+ space it requires, and the largest symbol value is the one
-+ used). Most targets have exactly one of these (which we
-+ translate to bfd_com_section_ptr), but ECOFF has two. */
-+#define SEC_IS_COMMON 0x1000
-+
-+ /* The section contains only debugging information. For
-+ example, this is set for ELF .debug and .stab sections.
-+ strip tests this flag to see if a section can be
-+ discarded. */
-+#define SEC_DEBUGGING 0x2000
-+
-+ /* The contents of this section are held in memory pointed to
-+ by the contents field. This is checked by bfd_get_section_contents,
-+ and the data is retrieved from memory if appropriate. */
-+#define SEC_IN_MEMORY 0x4000
-+
-+ /* The contents of this section are to be excluded by the
-+ linker for executable and shared objects unless those
-+ objects are to be further relocated. */
-+#define SEC_EXCLUDE 0x8000
-+
-+ /* The contents of this section are to be sorted based on the sum of
-+ the symbol and addend values specified by the associated relocation
-+ entries. Entries without associated relocation entries will be
-+ appended to the end of the section in an unspecified order. */
-+#define SEC_SORT_ENTRIES 0x10000
-+
-+ /* When linking, duplicate sections of the same name should be
-+ discarded, rather than being combined into a single section as
-+ is usually done. This is similar to how common symbols are
-+ handled. See SEC_LINK_DUPLICATES below. */
-+#define SEC_LINK_ONCE 0x20000
-+
-+ /* If SEC_LINK_ONCE is set, this bitfield describes how the linker
-+ should handle duplicate sections. */
-+#define SEC_LINK_DUPLICATES 0x40000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that duplicate
-+ sections with the same name should simply be discarded. */
-+#define SEC_LINK_DUPLICATES_DISCARD 0x0
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if there are any duplicate sections, although
-+ it should still only link one copy. */
-+#define SEC_LINK_DUPLICATES_ONE_ONLY 0x80000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if any duplicate sections are a different size. */
-+#define SEC_LINK_DUPLICATES_SAME_SIZE 0x100000
-+
-+ /* This value for SEC_LINK_DUPLICATES means that the linker
-+ should warn if any duplicate sections contain different
-+ contents. */
-+#define SEC_LINK_DUPLICATES_SAME_CONTENTS \
-+ (SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE)
-+
-+ /* This section was created by the linker as part of dynamic
-+ relocation or other arcane processing. It is skipped when
-+ going through the first-pass output, trusting that someone
-+ else up the line will take care of it later. */
-+#define SEC_LINKER_CREATED 0x200000
-+
-+ /* This section should not be subject to garbage collection.
-+ Also set to inform the linker that this section should not be
-+ listed in the link map as discarded. */
-+#define SEC_KEEP 0x400000
-+
-+ /* This section contains "short" data, and should be placed
-+ "near" the GP. */
-+#define SEC_SMALL_DATA 0x800000
-+
-+ /* Attempt to merge identical entities in the section.
-+ Entity size is given in the entsize field. */
-+#define SEC_MERGE 0x1000000
-+
-+ /* If given with SEC_MERGE, entities to merge are zero terminated
-+ strings where entsize specifies character size instead of fixed
-+ size entries. */
-+#define SEC_STRINGS 0x2000000
-+
-+ /* This section contains data about section groups. */
-+#define SEC_GROUP 0x4000000
-+
-+ /* The section is a COFF shared library section. This flag is
-+ only for the linker. If this type of section appears in
-+ the input file, the linker must copy it to the output file
-+ without changing the vma or size. FIXME: Although this
-+ was originally intended to be general, it really is COFF
-+ specific (and the flag was renamed to indicate this). It
-+ might be cleaner to have some more general mechanism to
-+ allow the back end to control what the linker does with
-+ sections. */
-+#define SEC_COFF_SHARED_LIBRARY 0x10000000
-+
-+ /* This section contains data which may be shared with other
-+ executables or shared objects. This is for COFF only. */
-+#define SEC_COFF_SHARED 0x20000000
-+
-+ /* When a section with this flag is being linked, then if the size of
-+ the input section is less than a page, it should not cross a page
-+ boundary. If the size of the input section is one page or more,
-+ it should be aligned on a page boundary. This is for TI
-+ TMS320C54X only. */
-+#define SEC_TIC54X_BLOCK 0x40000000
-+
-+ /* Conditionally link this section; do not link if there are no
-+ references found to any symbol in the section. This is for TI
-+ TMS320C54X only. */
-+#define SEC_TIC54X_CLINK 0x80000000
-+
-+ /* End of section flags. */
-+
-+ /* Some internal packed boolean fields. */
-+
-+ /* See the vma field. */
-+ unsigned int user_set_vma : 1;
-+
-+ /* A mark flag used by some of the linker backends. */
-+ unsigned int linker_mark : 1;
-+
-+ /* Another mark flag used by some of the linker backends. Set for
-+ output sections that have an input section. */
-+ unsigned int linker_has_input : 1;
-+
-+ /* Mark flags used by some linker backends for garbage collection. */
-+ unsigned int gc_mark : 1;
-+ unsigned int gc_mark_from_eh : 1;
-+
-+ /* The following flags are used by the ELF linker. */
-+
-+ /* Mark sections which have been allocated to segments. */
-+ unsigned int segment_mark : 1;
-+
-+ /* Type of sec_info information. */
-+ unsigned int sec_info_type:3;
-+#define ELF_INFO_TYPE_NONE 0
-+#define ELF_INFO_TYPE_STABS 1
-+#define ELF_INFO_TYPE_MERGE 2
-+#define ELF_INFO_TYPE_EH_FRAME 3
-+#define ELF_INFO_TYPE_JUST_SYMS 4
-+
-+ /* Nonzero if this section uses RELA relocations, rather than REL. */
-+ unsigned int use_rela_p:1;
-+
-+ /* Bits used by various backends. The generic code doesn't touch
-+ these fields. */
-+
-+ /* Nonzero if this section has TLS related relocations. */
-+ unsigned int has_tls_reloc:1;
-+
-+ /* Nonzero if this section has a gp reloc. */
-+ unsigned int has_gp_reloc:1;
-+
-+ /* Nonzero if this section needs the relax finalize pass. */
-+ unsigned int need_finalize_relax:1;
-+
-+ /* Whether relocations have been processed. */
-+ unsigned int reloc_done : 1;
-+
-+ /* End of internal packed boolean fields. */
-+
-+ /* The virtual memory address of the section - where it will be
-+ at run time. The symbols are relocated against this. The
-+ user_set_vma flag is maintained by bfd; if it's not set, the
-+ backend can assign addresses (for example, in <<a.out>>, where
-+ the default address for <<.data>> is dependent on the specific
-+ target and various flags). */
-+ bfd_vma vma;
-+
-+ /* The load address of the section - where it would be in a
-+ rom image; really only used for writing section header
-+ information. */
-+ bfd_vma lma;
-+
-+ /* The size of the section in octets, as it will be output.
-+ Contains a value even if the section has no contents (e.g., the
-+ size of <<.bss>>). */
-+ bfd_size_type size;
-+
-+ /* For input sections, the original size on disk of the section, in
-+ octets. This field is used by the linker relaxation code. It is
-+ currently only set for sections where the linker relaxation scheme
-+ doesn't cache altered section and reloc contents (stabs, eh_frame,
-+ SEC_MERGE, some coff relaxing targets), and thus the original size
-+ needs to be kept to read the section multiple times.
-+ For output sections, rawsize holds the section size calculated on
-+ a previous linker relaxation pass. */
-+ bfd_size_type rawsize;
-+
-+ /* If this section is going to be output, then this value is the
-+ offset in *bytes* into the output section of the first byte in the
-+ input section (byte ==> smallest addressable unit on the
-+ target). In most cases, if this was going to start at the
-+ 100th octet (8-bit quantity) in the output section, this value
-+ would be 100. However, if the target byte size is 16 bits
-+ (bfd_octets_per_byte is "2"), this value would be 50. */
-+ bfd_vma output_offset;
-+
-+ /* The output section through which to map on output. */
-+ struct bfd_section *output_section;
-+
-+ /* The alignment requirement of the section, as an exponent of 2 -
-+ e.g., 3 aligns to 2^3 (or 8). */
-+ unsigned int alignment_power;
-+
-+ /* If an input section, a pointer to a vector of relocation
-+ records for the data in this section. */
-+ struct reloc_cache_entry *relocation;
-+
-+ /* If an output section, a pointer to a vector of pointers to
-+ relocation records for the data in this section. */
-+ struct reloc_cache_entry **orelocation;
-+
-+ /* The number of relocation records in one of the above. */
-+ unsigned reloc_count;
-+
-+ /* Information below is back end specific - and not always used
-+ or updated. */
-+
-+ /* File position of section data. */
-+ file_ptr filepos;
-+
-+ /* File position of relocation info. */
-+ file_ptr rel_filepos;
-+
-+ /* File position of line data. */
-+ file_ptr line_filepos;
-+
-+ /* Pointer to data for applications. */
-+ void *userdata;
-+
-+ /* If the SEC_IN_MEMORY flag is set, this points to the actual
-+ contents. */
-+ unsigned char *contents;
-+
-+ /* Attached line number information. */
-+ alent *lineno;
-+
-+ /* Number of line number records. */
-+ unsigned int lineno_count;
-+
-+ /* Entity size for merging purposes. */
-+ unsigned int entsize;
-+
-+ /* Points to the kept section if this section is a link-once section,
-+ and is discarded. */
-+ struct bfd_section *kept_section;
-+
-+ /* When a section is being output, this value changes as more
-+ linenumbers are written out. */
-+ file_ptr moving_line_filepos;
-+
-+ /* What the section number is in the target world. */
-+ int target_index;
-+
-+ void *used_by_bfd;
-+
-+ /* If this is a constructor section then here is a list of the
-+ relocations created to relocate items within it. */
-+ struct relent_chain *constructor_chain;
-+
-+ /* The BFD which owns the section. */
-+ bfd *owner;
-+
-+ /* A symbol which points at this section only. */
-+ struct bfd_symbol *symbol;
-+ struct bfd_symbol **symbol_ptr_ptr;
-+
-+ /* Early in the link process, map_head and map_tail are used to build
-+ a list of input sections attached to an output section. Later,
-+ output sections use these fields for a list of bfd_link_order
-+ structs. */
-+ union {
-+ struct bfd_link_order *link_order;
-+ struct bfd_section *s;
-+ } map_head, map_tail;
-+} asection;
-+
-+/* These sections are global, and are managed by BFD. The application
-+ and target back end are not permitted to change the values in
-+ these sections. New code should use the section_ptr macros rather
-+ than referring directly to the const sections. The const sections
-+ may eventually vanish. */
-+#define BFD_ABS_SECTION_NAME "*ABS*"
-+#define BFD_UND_SECTION_NAME "*UND*"
-+#define BFD_COM_SECTION_NAME "*COM*"
-+#define BFD_IND_SECTION_NAME "*IND*"
-+
-+/* The absolute section. */
-+extern asection bfd_abs_section;
-+#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
-+#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
-+/* Pointer to the undefined section. */
-+extern asection bfd_und_section;
-+#define bfd_und_section_ptr ((asection *) &bfd_und_section)
-+#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
-+/* Pointer to the common section. */
-+extern asection bfd_com_section;
-+#define bfd_com_section_ptr ((asection *) &bfd_com_section)
-+/* Pointer to the indirect section. */
-+extern asection bfd_ind_section;
-+#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
-+#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
-+
-+#define bfd_is_const_section(SEC) \
-+ ( ((SEC) == bfd_abs_section_ptr) \
-+ || ((SEC) == bfd_und_section_ptr) \
-+ || ((SEC) == bfd_com_section_ptr) \
-+ || ((SEC) == bfd_ind_section_ptr))
-+
-+/* Macros to handle insertion and deletion of a bfd's sections. These
-+ only handle the list pointers, ie. do not adjust section_count,
-+ target_index etc. */
-+#define bfd_section_list_remove(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ asection *_next = _s->next; \
-+ asection *_prev = _s->prev; \
-+ if (_prev) \
-+ _prev->next = _next; \
-+ else \
-+ (ABFD)->sections = _next; \
-+ if (_next) \
-+ _next->prev = _prev; \
-+ else \
-+ (ABFD)->section_last = _prev; \
-+ } \
-+ while (0)
-+#define bfd_section_list_append(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ bfd *_abfd = ABFD; \
-+ _s->next = NULL; \
-+ if (_abfd->section_last) \
-+ { \
-+ _s->prev = _abfd->section_last; \
-+ _abfd->section_last->next = _s; \
-+ } \
-+ else \
-+ { \
-+ _s->prev = NULL; \
-+ _abfd->sections = _s; \
-+ } \
-+ _abfd->section_last = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_prepend(ABFD, S) \
-+ do \
-+ { \
-+ asection *_s = S; \
-+ bfd *_abfd = ABFD; \
-+ _s->prev = NULL; \
-+ if (_abfd->sections) \
-+ { \
-+ _s->next = _abfd->sections; \
-+ _abfd->sections->prev = _s; \
-+ } \
-+ else \
-+ { \
-+ _s->next = NULL; \
-+ _abfd->section_last = _s; \
-+ } \
-+ _abfd->sections = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_insert_after(ABFD, A, S) \
-+ do \
-+ { \
-+ asection *_a = A; \
-+ asection *_s = S; \
-+ asection *_next = _a->next; \
-+ _s->next = _next; \
-+ _s->prev = _a; \
-+ _a->next = _s; \
-+ if (_next) \
-+ _next->prev = _s; \
-+ else \
-+ (ABFD)->section_last = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_list_insert_before(ABFD, B, S) \
-+ do \
-+ { \
-+ asection *_b = B; \
-+ asection *_s = S; \
-+ asection *_prev = _b->prev; \
-+ _s->prev = _prev; \
-+ _s->next = _b; \
-+ _b->prev = _s; \
-+ if (_prev) \
-+ _prev->next = _s; \
-+ else \
-+ (ABFD)->sections = _s; \
-+ } \
-+ while (0)
-+#define bfd_section_removed_from_list(ABFD, S) \
-+ ((S)->next == NULL ? (ABFD)->section_last != (S) : (S)->next->prev != (S))
-+
-+#define BFD_FAKE_SECTION(SEC, FLAGS, SYM, NAME, IDX) \
-+ /* name, id, index, next, prev, flags, user_set_vma, */ \
-+ { NAME, IDX, 0, NULL, NULL, FLAGS, 0, \
-+ \
-+ /* linker_mark, linker_has_input, gc_mark, gc_mark_from_eh, */ \
-+ 0, 0, 1, 0, \
-+ \
-+ /* segment_mark, sec_info_type, use_rela_p, has_tls_reloc, */ \
-+ 0, 0, 0, 0, \
-+ \
-+ /* has_gp_reloc, need_finalize_relax, reloc_done, */ \
-+ 0, 0, 0, \
-+ \
-+ /* vma, lma, size, rawsize */ \
-+ 0, 0, 0, 0, \
-+ \
-+ /* output_offset, output_section, alignment_power, */ \
-+ 0, (struct bfd_section *) &SEC, 0, \
-+ \
-+ /* relocation, orelocation, reloc_count, filepos, rel_filepos, */ \
-+ NULL, NULL, 0, 0, 0, \
-+ \
-+ /* line_filepos, userdata, contents, lineno, lineno_count, */ \
-+ 0, NULL, NULL, NULL, 0, \
-+ \
-+ /* entsize, kept_section, moving_line_filepos, */ \
-+ 0, NULL, 0, \
-+ \
-+ /* target_index, used_by_bfd, constructor_chain, owner, */ \
-+ 0, NULL, NULL, NULL, \
-+ \
-+ /* symbol, symbol_ptr_ptr, */ \
-+ (struct bfd_symbol *) SYM, &SEC.symbol, \
-+ \
-+ /* map_head, map_tail */ \
-+ { NULL }, { NULL } \
-+ }
-+
-+void bfd_section_list_clear (bfd *);
-+
-+asection *bfd_get_section_by_name (bfd *abfd, const char *name);
-+
-+asection *bfd_get_section_by_name_if
-+ (bfd *abfd,
-+ const char *name,
-+ bfd_boolean (*func) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+char *bfd_get_unique_section_name
-+ (bfd *abfd, const char *templat, int *count);
-+
-+asection *bfd_make_section_old_way (bfd *abfd, const char *name);
-+
-+asection *bfd_make_section_anyway_with_flags
-+ (bfd *abfd, const char *name, flagword flags);
-+
-+asection *bfd_make_section_anyway (bfd *abfd, const char *name);
-+
-+asection *bfd_make_section_with_flags
-+ (bfd *, const char *name, flagword flags);
-+
-+asection *bfd_make_section (bfd *, const char *name);
-+
-+bfd_boolean bfd_set_section_flags
-+ (bfd *abfd, asection *sec, flagword flags);
-+
-+void bfd_map_over_sections
-+ (bfd *abfd,
-+ void (*func) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+asection *bfd_sections_find_if
-+ (bfd *abfd,
-+ bfd_boolean (*operation) (bfd *abfd, asection *sect, void *obj),
-+ void *obj);
-+
-+bfd_boolean bfd_set_section_size
-+ (bfd *abfd, asection *sec, bfd_size_type val);
-+
-+bfd_boolean bfd_set_section_contents
-+ (bfd *abfd, asection *section, const void *data,
-+ file_ptr offset, bfd_size_type count);
-+
-+bfd_boolean bfd_get_section_contents
-+ (bfd *abfd, asection *section, void *location, file_ptr offset,
-+ bfd_size_type count);
-+
-+bfd_boolean bfd_malloc_and_get_section
-+ (bfd *abfd, asection *section, bfd_byte **buf);
-+
-+bfd_boolean bfd_copy_private_section_data
-+ (bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
-+
-+#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
-+ BFD_SEND (obfd, _bfd_copy_private_section_data, \
-+ (ibfd, isection, obfd, osection))
-+bfd_boolean bfd_generic_is_group_section (bfd *, const asection *sec);
-+
-+bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group);
-+
-+/* Extracted from archures.c. */
-+enum bfd_architecture
-+{
-+ bfd_arch_unknown, /* File arch not known. */
-+ bfd_arch_obscure, /* Arch known, not one of these. */
-+ bfd_arch_m68k, /* Motorola 68xxx */
-+#define bfd_mach_m68000 1
-+#define bfd_mach_m68008 2
-+#define bfd_mach_m68010 3
-+#define bfd_mach_m68020 4
-+#define bfd_mach_m68030 5
-+#define bfd_mach_m68040 6
-+#define bfd_mach_m68060 7
-+#define bfd_mach_cpu32 8
-+#define bfd_mach_fido 9
-+#define bfd_mach_mcf_isa_a_nodiv 10
-+#define bfd_mach_mcf_isa_a 11
-+#define bfd_mach_mcf_isa_a_mac 12
-+#define bfd_mach_mcf_isa_a_emac 13
-+#define bfd_mach_mcf_isa_aplus 14
-+#define bfd_mach_mcf_isa_aplus_mac 15
-+#define bfd_mach_mcf_isa_aplus_emac 16
-+#define bfd_mach_mcf_isa_b_nousp 17
-+#define bfd_mach_mcf_isa_b_nousp_mac 18
-+#define bfd_mach_mcf_isa_b_nousp_emac 19
-+#define bfd_mach_mcf_isa_b 20
-+#define bfd_mach_mcf_isa_b_mac 21
-+#define bfd_mach_mcf_isa_b_emac 22
-+#define bfd_mach_mcf_isa_b_float 23
-+#define bfd_mach_mcf_isa_b_float_mac 24
-+#define bfd_mach_mcf_isa_b_float_emac 25
-+#define bfd_mach_mcf_isa_c 26
-+#define bfd_mach_mcf_isa_c_mac 27
-+#define bfd_mach_mcf_isa_c_emac 28
-+ bfd_arch_vax, /* DEC Vax */
-+ bfd_arch_i960, /* Intel 960 */
-+ /* The order of the following is important.
-+ lower number indicates a machine type that
-+ only accepts a subset of the instructions
-+ available to machines with higher numbers.
-+ The exception is the "ca", which is
-+ incompatible with all other machines except
-+ "core". */
-+
-+#define bfd_mach_i960_core 1
-+#define bfd_mach_i960_ka_sa 2
-+#define bfd_mach_i960_kb_sb 3
-+#define bfd_mach_i960_mc 4
-+#define bfd_mach_i960_xa 5
-+#define bfd_mach_i960_ca 6
-+#define bfd_mach_i960_jx 7
-+#define bfd_mach_i960_hx 8
-+
-+ bfd_arch_or32, /* OpenRISC 32 */
-+
-+ bfd_arch_sparc, /* SPARC */
-+#define bfd_mach_sparc 1
-+/* The difference between v8plus and v9 is that v9 is a true 64 bit env. */
-+#define bfd_mach_sparc_sparclet 2
-+#define bfd_mach_sparc_sparclite 3
-+#define bfd_mach_sparc_v8plus 4
-+#define bfd_mach_sparc_v8plusa 5 /* with ultrasparc add'ns. */
-+#define bfd_mach_sparc_sparclite_le 6
-+#define bfd_mach_sparc_v9 7
-+#define bfd_mach_sparc_v9a 8 /* with ultrasparc add'ns. */
-+#define bfd_mach_sparc_v8plusb 9 /* with cheetah add'ns. */
-+#define bfd_mach_sparc_v9b 10 /* with cheetah add'ns. */
-+/* Nonzero if MACH has the v9 instruction set. */
-+#define bfd_mach_sparc_v9_p(mach) \
-+ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \
-+ && (mach) != bfd_mach_sparc_sparclite_le)
-+/* Nonzero if MACH is a 64 bit sparc architecture. */
-+#define bfd_mach_sparc_64bit_p(mach) \
-+ ((mach) >= bfd_mach_sparc_v9 && (mach) != bfd_mach_sparc_v8plusb)
-+ bfd_arch_spu, /* PowerPC SPU */
-+#define bfd_mach_spu 256
-+ bfd_arch_mips, /* MIPS Rxxxx */
-+#define bfd_mach_mips3000 3000
-+#define bfd_mach_mips3900 3900
-+#define bfd_mach_mips4000 4000
-+#define bfd_mach_mips4010 4010
-+#define bfd_mach_mips4100 4100
-+#define bfd_mach_mips4111 4111
-+#define bfd_mach_mips4120 4120
-+#define bfd_mach_mips4300 4300
-+#define bfd_mach_mips4400 4400
-+#define bfd_mach_mips4600 4600
-+#define bfd_mach_mips4650 4650
-+#define bfd_mach_mips5000 5000
-+#define bfd_mach_mips5400 5400
-+#define bfd_mach_mips5500 5500
-+#define bfd_mach_mips6000 6000
-+#define bfd_mach_mips7000 7000
-+#define bfd_mach_mips8000 8000
-+#define bfd_mach_mips9000 9000
-+#define bfd_mach_mips10000 10000
-+#define bfd_mach_mips12000 12000
-+#define bfd_mach_mips16 16
-+#define bfd_mach_mips5 5
-+#define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */
-+#define bfd_mach_mipsisa32 32
-+#define bfd_mach_mipsisa32r2 33
-+#define bfd_mach_mipsisa64 64
-+#define bfd_mach_mipsisa64r2 65
-+ bfd_arch_i386, /* Intel 386 */
-+#define bfd_mach_i386_i386 1
-+#define bfd_mach_i386_i8086 2
-+#define bfd_mach_i386_i386_intel_syntax 3
-+#define bfd_mach_x86_64 64
-+#define bfd_mach_x86_64_intel_syntax 65
-+ bfd_arch_we32k, /* AT&T WE32xxx */
-+ bfd_arch_tahoe, /* CCI/Harris Tahoe */
-+ bfd_arch_i860, /* Intel 860 */
-+ bfd_arch_i370, /* IBM 360/370 Mainframes */
-+ bfd_arch_romp, /* IBM ROMP PC/RT */
-+ bfd_arch_convex, /* Convex */
-+ bfd_arch_m88k, /* Motorola 88xxx */
-+ bfd_arch_m98k, /* Motorola 98xxx */
-+ bfd_arch_pyramid, /* Pyramid Technology */
-+ bfd_arch_h8300, /* Renesas H8/300 (formerly Hitachi H8/300) */
-+#define bfd_mach_h8300 1
-+#define bfd_mach_h8300h 2
-+#define bfd_mach_h8300s 3
-+#define bfd_mach_h8300hn 4
-+#define bfd_mach_h8300sn 5
-+#define bfd_mach_h8300sx 6
-+#define bfd_mach_h8300sxn 7
-+ bfd_arch_pdp11, /* DEC PDP-11 */
-+ bfd_arch_powerpc, /* PowerPC */
-+#define bfd_mach_ppc 32
-+#define bfd_mach_ppc64 64
-+#define bfd_mach_ppc_403 403
-+#define bfd_mach_ppc_403gc 4030
-+#define bfd_mach_ppc_505 505
-+#define bfd_mach_ppc_601 601
-+#define bfd_mach_ppc_602 602
-+#define bfd_mach_ppc_603 603
-+#define bfd_mach_ppc_ec603e 6031
-+#define bfd_mach_ppc_604 604
-+#define bfd_mach_ppc_620 620
-+#define bfd_mach_ppc_630 630
-+#define bfd_mach_ppc_750 750
-+#define bfd_mach_ppc_860 860
-+#define bfd_mach_ppc_a35 35
-+#define bfd_mach_ppc_rs64ii 642
-+#define bfd_mach_ppc_rs64iii 643
-+#define bfd_mach_ppc_7400 7400
-+#define bfd_mach_ppc_e500 500
-+ bfd_arch_rs6000, /* IBM RS/6000 */
-+#define bfd_mach_rs6k 6000
-+#define bfd_mach_rs6k_rs1 6001
-+#define bfd_mach_rs6k_rsc 6003
-+#define bfd_mach_rs6k_rs2 6002
-+ bfd_arch_hppa, /* HP PA RISC */
-+#define bfd_mach_hppa10 10
-+#define bfd_mach_hppa11 11
-+#define bfd_mach_hppa20 20
-+#define bfd_mach_hppa20w 25
-+ bfd_arch_d10v, /* Mitsubishi D10V */
-+#define bfd_mach_d10v 1
-+#define bfd_mach_d10v_ts2 2
-+#define bfd_mach_d10v_ts3 3
-+ bfd_arch_d30v, /* Mitsubishi D30V */
-+ bfd_arch_dlx, /* DLX */
-+ bfd_arch_m68hc11, /* Motorola 68HC11 */
-+ bfd_arch_m68hc12, /* Motorola 68HC12 */
-+#define bfd_mach_m6812_default 0
-+#define bfd_mach_m6812 1
-+#define bfd_mach_m6812s 2
-+ bfd_arch_z8k, /* Zilog Z8000 */
-+#define bfd_mach_z8001 1
-+#define bfd_mach_z8002 2
-+ bfd_arch_h8500, /* Renesas H8/500 (formerly Hitachi H8/500) */
-+ bfd_arch_sh, /* Renesas / SuperH SH (formerly Hitachi SH) */
-+#define bfd_mach_sh 1
-+#define bfd_mach_sh2 0x20
-+#define bfd_mach_sh_dsp 0x2d
-+#define bfd_mach_sh2a 0x2a
-+#define bfd_mach_sh2a_nofpu 0x2b
-+#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1
-+#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2
-+#define bfd_mach_sh2a_or_sh4 0x2a3
-+#define bfd_mach_sh2a_or_sh3e 0x2a4
-+#define bfd_mach_sh2e 0x2e
-+#define bfd_mach_sh3 0x30
-+#define bfd_mach_sh3_nommu 0x31
-+#define bfd_mach_sh3_dsp 0x3d
-+#define bfd_mach_sh3e 0x3e
-+#define bfd_mach_sh4 0x40
-+#define bfd_mach_sh4_nofpu 0x41
-+#define bfd_mach_sh4_nommu_nofpu 0x42
-+#define bfd_mach_sh4a 0x4a
-+#define bfd_mach_sh4a_nofpu 0x4b
-+#define bfd_mach_sh4al_dsp 0x4d
-+#define bfd_mach_sh5 0x50
-+ bfd_arch_alpha, /* Dec Alpha */
-+#define bfd_mach_alpha_ev4 0x10
-+#define bfd_mach_alpha_ev5 0x20
-+#define bfd_mach_alpha_ev6 0x30
-+ bfd_arch_arm, /* Advanced Risc Machines ARM. */
-+#define bfd_mach_arm_unknown 0
-+#define bfd_mach_arm_2 1
-+#define bfd_mach_arm_2a 2
-+#define bfd_mach_arm_3 3
-+#define bfd_mach_arm_3M 4
-+#define bfd_mach_arm_4 5
-+#define bfd_mach_arm_4T 6
-+#define bfd_mach_arm_5 7
-+#define bfd_mach_arm_5T 8
-+#define bfd_mach_arm_5TE 9
-+#define bfd_mach_arm_XScale 10
-+#define bfd_mach_arm_ep9312 11
-+#define bfd_mach_arm_iWMMXt 12
-+#define bfd_mach_arm_iWMMXt2 13
-+ bfd_arch_ns32k, /* National Semiconductors ns32000 */
-+ bfd_arch_w65, /* WDC 65816 */
-+ bfd_arch_tic30, /* Texas Instruments TMS320C30 */
-+ bfd_arch_tic4x, /* Texas Instruments TMS320C3X/4X */
-+#define bfd_mach_tic3x 30
-+#define bfd_mach_tic4x 40
-+ bfd_arch_tic54x, /* Texas Instruments TMS320C54X */
-+ bfd_arch_tic80, /* TI TMS320c80 (MVP) */
-+ bfd_arch_v850, /* NEC V850 */
-+#define bfd_mach_v850 1
-+#define bfd_mach_v850e 'E'
-+#define bfd_mach_v850e1 '1'
-+ bfd_arch_arc, /* ARC Cores */
-+#define bfd_mach_arc_5 5
-+#define bfd_mach_arc_6 6
-+#define bfd_mach_arc_7 7
-+#define bfd_mach_arc_8 8
-+ bfd_arch_m32c, /* Renesas M16C/M32C. */
-+#define bfd_mach_m16c 0x75
-+#define bfd_mach_m32c 0x78
-+ bfd_arch_m32r, /* Renesas M32R (formerly Mitsubishi M32R/D) */
-+#define bfd_mach_m32r 1 /* For backwards compatibility. */
-+#define bfd_mach_m32rx 'x'
-+#define bfd_mach_m32r2 '2'
-+ bfd_arch_mn10200, /* Matsushita MN10200 */
-+ bfd_arch_mn10300, /* Matsushita MN10300 */
-+#define bfd_mach_mn10300 300
-+#define bfd_mach_am33 330
-+#define bfd_mach_am33_2 332
-+ bfd_arch_fr30,
-+#define bfd_mach_fr30 0x46523330
-+ bfd_arch_frv,
-+#define bfd_mach_frv 1
-+#define bfd_mach_frvsimple 2
-+#define bfd_mach_fr300 300
-+#define bfd_mach_fr400 400
-+#define bfd_mach_fr450 450
-+#define bfd_mach_frvtomcat 499 /* fr500 prototype */
-+#define bfd_mach_fr500 500
-+#define bfd_mach_fr550 550
-+ bfd_arch_mcore,
-+ bfd_arch_mep,
-+#define bfd_mach_mep 1
-+#define bfd_mach_mep_h1 0x6831
-+ bfd_arch_ia64, /* HP/Intel ia64 */
-+#define bfd_mach_ia64_elf64 64
-+#define bfd_mach_ia64_elf32 32
-+ bfd_arch_ip2k, /* Ubicom IP2K microcontrollers. */
-+#define bfd_mach_ip2022 1
-+#define bfd_mach_ip2022ext 2
-+ bfd_arch_iq2000, /* Vitesse IQ2000. */
-+#define bfd_mach_iq2000 1
-+#define bfd_mach_iq10 2
-+ bfd_arch_mt,
-+#define bfd_mach_ms1 1
-+#define bfd_mach_mrisc2 2
-+#define bfd_mach_ms2 3
-+ bfd_arch_pj,
-+ bfd_arch_avr, /* Atmel AVR microcontrollers. */
-+#define bfd_mach_avr1 1
-+#define bfd_mach_avr2 2
-+#define bfd_mach_avr3 3
-+#define bfd_mach_avr4 4
-+#define bfd_mach_avr5 5
-+#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
-+ bfd_arch_bfin, /* ADI Blackfin */
-+#define bfd_mach_bfin 1
-+ bfd_arch_cr16, /* National Semiconductor CompactRISC (ie CR16). */
-+#define bfd_mach_cr16 1
-+ bfd_arch_cr16c, /* National Semiconductor CompactRISC. */
-+#define bfd_mach_cr16c 1
-+ bfd_arch_crx, /* National Semiconductor CRX. */
-+#define bfd_mach_crx 1
-+ bfd_arch_cris, /* Axis CRIS */
-+#define bfd_mach_cris_v0_v10 255
-+#define bfd_mach_cris_v32 32
-+#define bfd_mach_cris_v10_v32 1032
-+ bfd_arch_s390, /* IBM s390 */
-+#define bfd_mach_s390_31 31
-+#define bfd_mach_s390_64 64
-+ bfd_arch_score, /* Sunplus score */
-+ bfd_arch_openrisc, /* OpenRISC */
-+ bfd_arch_mmix, /* Donald Knuth's educational processor. */
-+ bfd_arch_xstormy16,
-+#define bfd_mach_xstormy16 1
-+ bfd_arch_msp430, /* Texas Instruments MSP430 architecture. */
-+#define bfd_mach_msp11 11
-+#define bfd_mach_msp110 110
-+#define bfd_mach_msp12 12
-+#define bfd_mach_msp13 13
-+#define bfd_mach_msp14 14
-+#define bfd_mach_msp15 15
-+#define bfd_mach_msp16 16
-+#define bfd_mach_msp21 21
-+#define bfd_mach_msp31 31
-+#define bfd_mach_msp32 32
-+#define bfd_mach_msp33 33
-+#define bfd_mach_msp41 41
-+#define bfd_mach_msp42 42
-+#define bfd_mach_msp43 43
-+#define bfd_mach_msp44 44
-+ bfd_arch_xc16x, /* Infineon's XC16X Series. */
-+#define bfd_mach_xc16x 1
-+#define bfd_mach_xc16xl 2
-+#define bfd_mach_xc16xs 3
-+ bfd_arch_xtensa, /* Tensilica's Xtensa cores. */
-+#define bfd_mach_xtensa 1
-+ bfd_arch_maxq, /* Dallas MAXQ 10/20 */
-+#define bfd_mach_maxq10 10
-+#define bfd_mach_maxq20 20
-+ bfd_arch_z80,
-+#define bfd_mach_z80strict 1 /* No undocumented opcodes. */
-+#define bfd_mach_z80 3 /* With ixl, ixh, iyl, and iyh. */
-+#define bfd_mach_z80full 7 /* All undocumented instructions. */
-+#define bfd_mach_r800 11 /* R800: successor with multiplication. */
-+ bfd_arch_last
-+ };
-+
-+typedef struct bfd_arch_info
-+{
-+ int bits_per_word;
-+ int bits_per_address;
-+ int bits_per_byte;
-+ enum bfd_architecture arch;
-+ unsigned long mach;
-+ const char *arch_name;
-+ const char *printable_name;
-+ unsigned int section_align_power;
-+ /* TRUE if this is the default machine for the architecture.
-+ The default arch should be the first entry for an arch so that
-+ all the entries for that arch can be accessed via <<next>>. */
-+ bfd_boolean the_default;
-+ const struct bfd_arch_info * (*compatible)
-+ (const struct bfd_arch_info *a, const struct bfd_arch_info *b);
-+
-+ bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
-+
-+ const struct bfd_arch_info *next;
-+}
-+bfd_arch_info_type;
-+
-+const char *bfd_printable_name (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_scan_arch (const char *string);
-+
-+const char **bfd_arch_list (void);
-+
-+const bfd_arch_info_type *bfd_arch_get_compatible
-+ (const bfd *abfd, const bfd *bbfd, bfd_boolean accept_unknowns);
-+
-+void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
-+
-+enum bfd_architecture bfd_get_arch (bfd *abfd);
-+
-+unsigned long bfd_get_mach (bfd *abfd);
-+
-+unsigned int bfd_arch_bits_per_byte (bfd *abfd);
-+
-+unsigned int bfd_arch_bits_per_address (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_get_arch_info (bfd *abfd);
-+
-+const bfd_arch_info_type *bfd_lookup_arch
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+const char *bfd_printable_arch_mach
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+unsigned int bfd_octets_per_byte (bfd *abfd);
-+
-+unsigned int bfd_arch_mach_octets_per_byte
-+ (enum bfd_architecture arch, unsigned long machine);
-+
-+/* Extracted from reloc.c. */
-+typedef enum bfd_reloc_status
-+{
-+ /* No errors detected. */
-+ bfd_reloc_ok,
-+
-+ /* The relocation was performed, but there was an overflow. */
-+ bfd_reloc_overflow,
-+
-+ /* The address to relocate was not within the section supplied. */
-+ bfd_reloc_outofrange,
-+
-+ /* Used by special functions. */
-+ bfd_reloc_continue,
-+
-+ /* Unsupported relocation size requested. */
-+ bfd_reloc_notsupported,
-+
-+ /* Unused. */
-+ bfd_reloc_other,
-+
-+ /* The symbol to relocate against was undefined. */
-+ bfd_reloc_undefined,
-+
-+ /* The relocation was performed, but may not be ok - presently
-+ generated only when linking i960 coff files with i960 b.out
-+ symbols. If this type is returned, the error_message argument
-+ to bfd_perform_relocation will be set. */
-+ bfd_reloc_dangerous
-+ }
-+ bfd_reloc_status_type;
-+
-+
-+typedef struct reloc_cache_entry
-+{
-+ /* A pointer into the canonical table of pointers. */
-+ struct bfd_symbol **sym_ptr_ptr;
-+
-+ /* offset in section. */
-+ bfd_size_type address;
-+
-+ /* addend for relocation value. */
-+ bfd_vma addend;
-+
-+ /* Pointer to how to perform the required relocation. */
-+ reloc_howto_type *howto;
-+
-+}
-+arelent;
-+
-+enum complain_overflow
-+{
-+ /* Do not complain on overflow. */
-+ complain_overflow_dont,
-+
-+ /* Complain if the value overflows when considered as a signed
-+ number one bit larger than the field. ie. A bitfield of N bits
-+ is allowed to represent -2**n to 2**n-1. */
-+ complain_overflow_bitfield,
-+
-+ /* Complain if the value overflows when considered as a signed
-+ number. */
-+ complain_overflow_signed,
-+
-+ /* Complain if the value overflows when considered as an
-+ unsigned number. */
-+ complain_overflow_unsigned
-+};
-+
-+struct reloc_howto_struct
-+{
-+ /* The type field has mainly a documentary use - the back end can
-+ do what it wants with it, though normally the back end's
-+ external idea of what a reloc number is stored
-+ in this field. For example, a PC relative word relocation
-+ in a coff environment has the type 023 - because that's
-+ what the outside world calls a R_PCRWORD reloc. */
-+ unsigned int type;
-+
-+ /* The value the final relocation is shifted right by. This drops
-+ unwanted data from the relocation. */
-+ unsigned int rightshift;
-+
-+ /* The size of the item to be relocated. This is *not* a
-+ power-of-two measure. To get the number of bytes operated
-+ on by a type of relocation, use bfd_get_reloc_size. */
-+ int size;
-+
-+ /* The number of bits in the item to be relocated. This is used
-+ when doing overflow checking. */
-+ unsigned int bitsize;
-+
-+ /* Notes that the relocation is relative to the location in the
-+ data section of the addend. The relocation function will
-+ subtract from the relocation value the address of the location
-+ being relocated. */
-+ bfd_boolean pc_relative;
-+
-+ /* The bit position of the reloc value in the destination.
-+ The relocated value is left shifted by this amount. */
-+ unsigned int bitpos;
-+
-+ /* What type of overflow error should be checked for when
-+ relocating. */
-+ enum complain_overflow complain_on_overflow;
-+
-+ /* If this field is non null, then the supplied function is
-+ called rather than the normal function. This allows really
-+ strange relocation methods to be accommodated (e.g., i960 callj
-+ instructions). */
-+ bfd_reloc_status_type (*special_function)
-+ (bfd *, arelent *, struct bfd_symbol *, void *, asection *,
-+ bfd *, char **);
-+
-+ /* The textual name of the relocation type. */
-+ char *name;
-+
-+ /* Some formats record a relocation addend in the section contents
-+ rather than with the relocation. For ELF formats this is the
-+ distinction between USE_REL and USE_RELA (though the code checks
-+ for USE_REL == 1/0). The value of this field is TRUE if the
-+ addend is recorded with the section contents; when performing a
-+ partial link (ld -r) the section contents (the data) will be
-+ modified. The value of this field is FALSE if addends are
-+ recorded with the relocation (in arelent.addend); when performing
-+ a partial link the relocation will be modified.
-+ All relocations for all ELF USE_RELA targets should set this field
-+ to FALSE (values of TRUE should be looked on with suspicion).
-+ However, the converse is not true: not all relocations of all ELF
-+ USE_REL targets set this field to TRUE. Why this is so is peculiar
-+ to each particular target. For relocs that aren't used in partial
-+ links (e.g. GOT stuff) it doesn't matter what this is set to. */
-+ bfd_boolean partial_inplace;
-+
-+ /* src_mask selects the part of the instruction (or data) to be used
-+ in the relocation sum. If the target relocations don't have an
-+ addend in the reloc, eg. ELF USE_REL, src_mask will normally equal
-+ dst_mask to extract the addend from the section contents. If
-+ relocations do have an addend in the reloc, eg. ELF USE_RELA, this
-+ field should be zero. Non-zero values for ELF USE_RELA targets are
-+ bogus as in those cases the value in the dst_mask part of the
-+ section contents should be treated as garbage. */
-+ bfd_vma src_mask;
-+
-+ /* dst_mask selects which parts of the instruction (or data) are
-+ replaced with a relocated value. */
-+ bfd_vma dst_mask;
-+
-+ /* When some formats create PC relative instructions, they leave
-+ the value of the pc of the place being relocated in the offset
-+ slot of the instruction, so that a PC relative relocation can
-+ be made just by adding in an ordinary offset (e.g., sun3 a.out).
-+ Some formats leave the displacement part of an instruction
-+ empty (e.g., m88k bcs); this flag signals the fact. */
-+ bfd_boolean pcrel_offset;
-+};
-+
-+#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
-+ { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
-+#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
-+ HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
-+ NAME, FALSE, 0, 0, IN)
-+
-+#define EMPTY_HOWTO(C) \
-+ HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
-+ NULL, FALSE, 0, 0, FALSE)
-+
-+#define HOWTO_PREPARE(relocation, symbol) \
-+ { \
-+ if (symbol != NULL) \
-+ { \
-+ if (bfd_is_com_section (symbol->section)) \
-+ { \
-+ relocation = 0; \
-+ } \
-+ else \
-+ { \
-+ relocation = symbol->value; \
-+ } \
-+ } \
-+ }
-+
-+unsigned int bfd_get_reloc_size (reloc_howto_type *);
-+
-+typedef struct relent_chain
-+{
-+ arelent relent;
-+ struct relent_chain *next;
-+}
-+arelent_chain;
-+
-+bfd_reloc_status_type bfd_check_overflow
-+ (enum complain_overflow how,
-+ unsigned int bitsize,
-+ unsigned int rightshift,
-+ unsigned int addrsize,
-+ bfd_vma relocation);
-+
-+bfd_reloc_status_type bfd_perform_relocation
-+ (bfd *abfd,
-+ arelent *reloc_entry,
-+ void *data,
-+ asection *input_section,
-+ bfd *output_bfd,
-+ char **error_message);
-+
-+bfd_reloc_status_type bfd_install_relocation
-+ (bfd *abfd,
-+ arelent *reloc_entry,
-+ void *data, bfd_vma data_start,
-+ asection *input_section,
-+ char **error_message);
-+
-+enum bfd_reloc_code_real {
-+ _dummy_first_bfd_reloc_code_real,
-+
-+
-+/* Basic absolute relocations of N bits. */
-+ BFD_RELOC_64,
-+ BFD_RELOC_32,
-+ BFD_RELOC_26,
-+ BFD_RELOC_24,
-+ BFD_RELOC_16,
-+ BFD_RELOC_14,
-+ BFD_RELOC_8,
-+
-+/* PC-relative relocations. Sometimes these are relative to the address
-+of the relocation itself; sometimes they are relative to the start of
-+the section containing the relocation. It depends on the specific target.
-+
-+The 24-bit relocation is used in some Intel 960 configurations. */
-+ BFD_RELOC_64_PCREL,
-+ BFD_RELOC_32_PCREL,
-+ BFD_RELOC_24_PCREL,
-+ BFD_RELOC_16_PCREL,
-+ BFD_RELOC_12_PCREL,
-+ BFD_RELOC_8_PCREL,
-+
-+/* Section relative relocations. Some targets need this for DWARF2. */
-+ BFD_RELOC_32_SECREL,
-+
-+/* For ELF. */
-+ BFD_RELOC_32_GOT_PCREL,
-+ BFD_RELOC_16_GOT_PCREL,
-+ BFD_RELOC_8_GOT_PCREL,
-+ BFD_RELOC_32_GOTOFF,
-+ BFD_RELOC_16_GOTOFF,
-+ BFD_RELOC_LO16_GOTOFF,
-+ BFD_RELOC_HI16_GOTOFF,
-+ BFD_RELOC_HI16_S_GOTOFF,
-+ BFD_RELOC_8_GOTOFF,
-+ BFD_RELOC_64_PLT_PCREL,
-+ BFD_RELOC_32_PLT_PCREL,
-+ BFD_RELOC_24_PLT_PCREL,
-+ BFD_RELOC_16_PLT_PCREL,
-+ BFD_RELOC_8_PLT_PCREL,
-+ BFD_RELOC_64_PLTOFF,
-+ BFD_RELOC_32_PLTOFF,
-+ BFD_RELOC_16_PLTOFF,
-+ BFD_RELOC_LO16_PLTOFF,
-+ BFD_RELOC_HI16_PLTOFF,
-+ BFD_RELOC_HI16_S_PLTOFF,
-+ BFD_RELOC_8_PLTOFF,
-+
-+/* Relocations used by 68K ELF. */
-+ BFD_RELOC_68K_GLOB_DAT,
-+ BFD_RELOC_68K_JMP_SLOT,
-+ BFD_RELOC_68K_RELATIVE,
-+
-+/* Linkage-table relative. */
-+ BFD_RELOC_32_BASEREL,
-+ BFD_RELOC_16_BASEREL,
-+ BFD_RELOC_LO16_BASEREL,
-+ BFD_RELOC_HI16_BASEREL,
-+ BFD_RELOC_HI16_S_BASEREL,
-+ BFD_RELOC_8_BASEREL,
-+ BFD_RELOC_RVA,
-+
-+/* Absolute 8-bit relocation, but used to form an address like 0xFFnn. */
-+ BFD_RELOC_8_FFnn,
-+
-+/* These PC-relative relocations are stored as word displacements --
-+i.e., byte displacements shifted right two bits. The 30-bit word
-+displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
-+SPARC. (SPARC tools generally refer to this as <<WDISP30>>.) The
-+signed 16-bit displacement is used on the MIPS, and the 23-bit
-+displacement is used on the Alpha. */
-+ BFD_RELOC_32_PCREL_S2,
-+ BFD_RELOC_16_PCREL_S2,
-+ BFD_RELOC_23_PCREL_S2,
-+
-+/* High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
-+the target word. These are used on the SPARC. */
-+ BFD_RELOC_HI22,
-+ BFD_RELOC_LO10,
-+
-+/* For systems that allocate a Global Pointer register, these are
-+displacements off that register. These relocation types are
-+handled specially, because the value the register will have is
-+decided relatively late. */
-+ BFD_RELOC_GPREL16,
-+ BFD_RELOC_GPREL32,
-+
-+/* Reloc types used for i960/b.out. */
-+ BFD_RELOC_I960_CALLJ,
-+
-+/* SPARC ELF relocations. There is probably some overlap with other
-+relocation types already defined. */
-+ BFD_RELOC_NONE,
-+ BFD_RELOC_SPARC_WDISP22,
-+ BFD_RELOC_SPARC22,
-+ BFD_RELOC_SPARC13,
-+ BFD_RELOC_SPARC_GOT10,
-+ BFD_RELOC_SPARC_GOT13,
-+ BFD_RELOC_SPARC_GOT22,
-+ BFD_RELOC_SPARC_PC10,
-+ BFD_RELOC_SPARC_PC22,
-+ BFD_RELOC_SPARC_WPLT30,
-+ BFD_RELOC_SPARC_COPY,
-+ BFD_RELOC_SPARC_GLOB_DAT,
-+ BFD_RELOC_SPARC_JMP_SLOT,
-+ BFD_RELOC_SPARC_RELATIVE,
-+ BFD_RELOC_SPARC_UA16,
-+ BFD_RELOC_SPARC_UA32,
-+ BFD_RELOC_SPARC_UA64,
-+
-+/* I think these are specific to SPARC a.out (e.g., Sun 4). */
-+ BFD_RELOC_SPARC_BASE13,
-+ BFD_RELOC_SPARC_BASE22,
-+
-+/* SPARC64 relocations */
-+#define BFD_RELOC_SPARC_64 BFD_RELOC_64
-+ BFD_RELOC_SPARC_10,
-+ BFD_RELOC_SPARC_11,
-+ BFD_RELOC_SPARC_OLO10,
-+ BFD_RELOC_SPARC_HH22,
-+ BFD_RELOC_SPARC_HM10,
-+ BFD_RELOC_SPARC_LM22,
-+ BFD_RELOC_SPARC_PC_HH22,
-+ BFD_RELOC_SPARC_PC_HM10,
-+ BFD_RELOC_SPARC_PC_LM22,
-+ BFD_RELOC_SPARC_WDISP16,
-+ BFD_RELOC_SPARC_WDISP19,
-+ BFD_RELOC_SPARC_7,
-+ BFD_RELOC_SPARC_6,
-+ BFD_RELOC_SPARC_5,
-+#define BFD_RELOC_SPARC_DISP64 BFD_RELOC_64_PCREL
-+ BFD_RELOC_SPARC_PLT32,
-+ BFD_RELOC_SPARC_PLT64,
-+ BFD_RELOC_SPARC_HIX22,
-+ BFD_RELOC_SPARC_LOX10,
-+ BFD_RELOC_SPARC_H44,
-+ BFD_RELOC_SPARC_M44,
-+ BFD_RELOC_SPARC_L44,
-+ BFD_RELOC_SPARC_REGISTER,
-+
-+/* SPARC little endian relocation */
-+ BFD_RELOC_SPARC_REV32,
-+
-+/* SPARC TLS relocations */
-+ BFD_RELOC_SPARC_TLS_GD_HI22,
-+ BFD_RELOC_SPARC_TLS_GD_LO10,
-+ BFD_RELOC_SPARC_TLS_GD_ADD,
-+ BFD_RELOC_SPARC_TLS_GD_CALL,
-+ BFD_RELOC_SPARC_TLS_LDM_HI22,
-+ BFD_RELOC_SPARC_TLS_LDM_LO10,
-+ BFD_RELOC_SPARC_TLS_LDM_ADD,
-+ BFD_RELOC_SPARC_TLS_LDM_CALL,
-+ BFD_RELOC_SPARC_TLS_LDO_HIX22,
-+ BFD_RELOC_SPARC_TLS_LDO_LOX10,
-+ BFD_RELOC_SPARC_TLS_LDO_ADD,
-+ BFD_RELOC_SPARC_TLS_IE_HI22,
-+ BFD_RELOC_SPARC_TLS_IE_LO10,
-+ BFD_RELOC_SPARC_TLS_IE_LD,
-+ BFD_RELOC_SPARC_TLS_IE_LDX,
-+ BFD_RELOC_SPARC_TLS_IE_ADD,
-+ BFD_RELOC_SPARC_TLS_LE_HIX22,
-+ BFD_RELOC_SPARC_TLS_LE_LOX10,
-+ BFD_RELOC_SPARC_TLS_DTPMOD32,
-+ BFD_RELOC_SPARC_TLS_DTPMOD64,
-+ BFD_RELOC_SPARC_TLS_DTPOFF32,
-+ BFD_RELOC_SPARC_TLS_DTPOFF64,
-+ BFD_RELOC_SPARC_TLS_TPOFF32,
-+ BFD_RELOC_SPARC_TLS_TPOFF64,
-+
-+/* SPU Relocations. */
-+ BFD_RELOC_SPU_IMM7,
-+ BFD_RELOC_SPU_IMM8,
-+ BFD_RELOC_SPU_IMM10,
-+ BFD_RELOC_SPU_IMM10W,
-+ BFD_RELOC_SPU_IMM16,
-+ BFD_RELOC_SPU_IMM16W,
-+ BFD_RELOC_SPU_IMM18,
-+ BFD_RELOC_SPU_PCREL9a,
-+ BFD_RELOC_SPU_PCREL9b,
-+ BFD_RELOC_SPU_PCREL16,
-+ BFD_RELOC_SPU_LO16,
-+ BFD_RELOC_SPU_HI16,
-+ BFD_RELOC_SPU_PPU32,
-+ BFD_RELOC_SPU_PPU64,
-+
-+/* Alpha ECOFF and ELF relocations. Some of these treat the symbol or
-+"addend" in some special way.
-+For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
-+writing; when reading, it will be the absolute section symbol. The
-+addend is the displacement in bytes of the "lda" instruction from
-+the "ldah" instruction (which is at the address of this reloc). */
-+ BFD_RELOC_ALPHA_GPDISP_HI16,
-+
-+/* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
-+with GPDISP_HI16 relocs. The addend is ignored when writing the
-+relocations out, and is filled in with the file's GP value on
-+reading, for convenience. */
-+ BFD_RELOC_ALPHA_GPDISP_LO16,
-+
-+/* The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
-+relocation except that there is no accompanying GPDISP_LO16
-+relocation. */
-+ BFD_RELOC_ALPHA_GPDISP,
-+
-+/* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
-+the assembler turns it into a LDQ instruction to load the address of
-+the symbol, and then fills in a register in the real instruction.
-+
-+The LITERAL reloc, at the LDQ instruction, refers to the .lita
-+section symbol. The addend is ignored when writing, but is filled
-+in with the file's GP value on reading, for convenience, as with the
-+GPDISP_LO16 reloc.
-+
-+The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
-+It should refer to the symbol to be referenced, as with 16_GOTOFF,
-+but it generates output not based on the position within the .got
-+section, but relative to the GP value chosen for the file during the
-+final link stage.
-+
-+The LITUSE reloc, on the instruction using the loaded address, gives
-+information to the linker that it might be able to use to optimize
-+away some literal section references. The symbol is ignored (read
-+as the absolute section symbol), and the "addend" indicates the type
-+of instruction using the register:
-+1 - "memory" fmt insn
-+2 - byte-manipulation (byte offset reg)
-+3 - jsr (target of branch) */
-+ BFD_RELOC_ALPHA_LITERAL,
-+ BFD_RELOC_ALPHA_ELF_LITERAL,
-+ BFD_RELOC_ALPHA_LITUSE,
-+
-+/* The HINT relocation indicates a value that should be filled into the
-+"hint" field of a jmp/jsr/ret instruction, for possible branch-
-+prediction logic which may be provided on some processors. */
-+ BFD_RELOC_ALPHA_HINT,
-+
-+/* The LINKAGE relocation outputs a linkage pair in the object file,
-+which is filled by the linker. */
-+ BFD_RELOC_ALPHA_LINKAGE,
-+
-+/* The CODEADDR relocation outputs a STO_CA in the object file,
-+which is filled by the linker. */
-+ BFD_RELOC_ALPHA_CODEADDR,
-+
-+/* The GPREL_HI/LO relocations together form a 32-bit offset from the
-+GP register. */
-+ BFD_RELOC_ALPHA_GPREL_HI16,
-+ BFD_RELOC_ALPHA_GPREL_LO16,
-+
-+/* Like BFD_RELOC_23_PCREL_S2, except that the source and target must
-+share a common GP, and the target address is adjusted for
-+STO_ALPHA_STD_GPLOAD. */
-+ BFD_RELOC_ALPHA_BRSGP,
-+
-+/* Alpha thread-local storage relocations. */
-+ BFD_RELOC_ALPHA_TLSGD,
-+ BFD_RELOC_ALPHA_TLSLDM,
-+ BFD_RELOC_ALPHA_DTPMOD64,
-+ BFD_RELOC_ALPHA_GOTDTPREL16,
-+ BFD_RELOC_ALPHA_DTPREL64,
-+ BFD_RELOC_ALPHA_DTPREL_HI16,
-+ BFD_RELOC_ALPHA_DTPREL_LO16,
-+ BFD_RELOC_ALPHA_DTPREL16,
-+ BFD_RELOC_ALPHA_GOTTPREL16,
-+ BFD_RELOC_ALPHA_TPREL64,
-+ BFD_RELOC_ALPHA_TPREL_HI16,
-+ BFD_RELOC_ALPHA_TPREL_LO16,
-+ BFD_RELOC_ALPHA_TPREL16,
-+
-+/* Bits 27..2 of the relocation address shifted right 2 bits;
-+simple reloc otherwise. */
-+ BFD_RELOC_MIPS_JMP,
-+
-+/* The MIPS16 jump instruction. */
-+ BFD_RELOC_MIPS16_JMP,
-+
-+/* MIPS16 GP relative reloc. */
-+ BFD_RELOC_MIPS16_GPREL,
-+
-+/* High 16 bits of 32-bit value; simple reloc. */
-+ BFD_RELOC_HI16,
-+
-+/* High 16 bits of 32-bit value but the low 16 bits will be sign
-+extended and added to form the final result. If the low 16
-+bits form a negative number, we need to add one to the high value
-+to compensate for the borrow when the low bits are added. */
-+ BFD_RELOC_HI16_S,
-+
-+/* Low 16 bits. */
-+ BFD_RELOC_LO16,
-+
-+/* High 16 bits of 32-bit pc-relative value */
-+ BFD_RELOC_HI16_PCREL,
-+
-+/* High 16 bits of 32-bit pc-relative value, adjusted */
-+ BFD_RELOC_HI16_S_PCREL,
-+
-+/* Low 16 bits of pc-relative value */
-+ BFD_RELOC_LO16_PCREL,
-+
-+/* MIPS16 high 16 bits of 32-bit value. */
-+ BFD_RELOC_MIPS16_HI16,
-+
-+/* MIPS16 high 16 bits of 32-bit value but the low 16 bits will be sign
-+extended and added to form the final result. If the low 16
-+bits form a negative number, we need to add one to the high value
-+to compensate for the borrow when the low bits are added. */
-+ BFD_RELOC_MIPS16_HI16_S,
-+
-+/* MIPS16 low 16 bits. */
-+ BFD_RELOC_MIPS16_LO16,
-+
-+/* Relocation against a MIPS literal section. */
-+ BFD_RELOC_MIPS_LITERAL,
-+
-+/* MIPS ELF relocations. */
-+ BFD_RELOC_MIPS_GOT16,
-+ BFD_RELOC_MIPS_CALL16,
-+ BFD_RELOC_MIPS_GOT_HI16,
-+ BFD_RELOC_MIPS_GOT_LO16,
-+ BFD_RELOC_MIPS_CALL_HI16,
-+ BFD_RELOC_MIPS_CALL_LO16,
-+ BFD_RELOC_MIPS_SUB,
-+ BFD_RELOC_MIPS_GOT_PAGE,
-+ BFD_RELOC_MIPS_GOT_OFST,
-+ BFD_RELOC_MIPS_GOT_DISP,
-+ BFD_RELOC_MIPS_SHIFT5,
-+ BFD_RELOC_MIPS_SHIFT6,
-+ BFD_RELOC_MIPS_INSERT_A,
-+ BFD_RELOC_MIPS_INSERT_B,
-+ BFD_RELOC_MIPS_DELETE,
-+ BFD_RELOC_MIPS_HIGHEST,
-+ BFD_RELOC_MIPS_HIGHER,
-+ BFD_RELOC_MIPS_SCN_DISP,
-+ BFD_RELOC_MIPS_REL16,
-+ BFD_RELOC_MIPS_RELGOT,
-+ BFD_RELOC_MIPS_JALR,
-+ BFD_RELOC_MIPS_TLS_DTPMOD32,
-+ BFD_RELOC_MIPS_TLS_DTPREL32,
-+ BFD_RELOC_MIPS_TLS_DTPMOD64,
-+ BFD_RELOC_MIPS_TLS_DTPREL64,
-+ BFD_RELOC_MIPS_TLS_GD,
-+ BFD_RELOC_MIPS_TLS_LDM,
-+ BFD_RELOC_MIPS_TLS_DTPREL_HI16,
-+ BFD_RELOC_MIPS_TLS_DTPREL_LO16,
-+ BFD_RELOC_MIPS_TLS_GOTTPREL,
-+ BFD_RELOC_MIPS_TLS_TPREL32,
-+ BFD_RELOC_MIPS_TLS_TPREL64,
-+ BFD_RELOC_MIPS_TLS_TPREL_HI16,
-+ BFD_RELOC_MIPS_TLS_TPREL_LO16,
-+
-+
-+/* MIPS ELF relocations (VxWorks extensions). */
-+ BFD_RELOC_MIPS_COPY,
-+ BFD_RELOC_MIPS_JUMP_SLOT,
-+
-+
-+/* Fujitsu Frv Relocations. */
-+ BFD_RELOC_FRV_LABEL16,
-+ BFD_RELOC_FRV_LABEL24,
-+ BFD_RELOC_FRV_LO16,
-+ BFD_RELOC_FRV_HI16,
-+ BFD_RELOC_FRV_GPREL12,
-+ BFD_RELOC_FRV_GPRELU12,
-+ BFD_RELOC_FRV_GPREL32,
-+ BFD_RELOC_FRV_GPRELHI,
-+ BFD_RELOC_FRV_GPRELLO,
-+ BFD_RELOC_FRV_GOT12,
-+ BFD_RELOC_FRV_GOTHI,
-+ BFD_RELOC_FRV_GOTLO,
-+ BFD_RELOC_FRV_FUNCDESC,
-+ BFD_RELOC_FRV_FUNCDESC_GOT12,
-+ BFD_RELOC_FRV_FUNCDESC_GOTHI,
-+ BFD_RELOC_FRV_FUNCDESC_GOTLO,
-+ BFD_RELOC_FRV_FUNCDESC_VALUE,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFF12,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFFHI,
-+ BFD_RELOC_FRV_FUNCDESC_GOTOFFLO,
-+ BFD_RELOC_FRV_GOTOFF12,
-+ BFD_RELOC_FRV_GOTOFFHI,
-+ BFD_RELOC_FRV_GOTOFFLO,
-+ BFD_RELOC_FRV_GETTLSOFF,
-+ BFD_RELOC_FRV_TLSDESC_VALUE,
-+ BFD_RELOC_FRV_GOTTLSDESC12,
-+ BFD_RELOC_FRV_GOTTLSDESCHI,
-+ BFD_RELOC_FRV_GOTTLSDESCLO,
-+ BFD_RELOC_FRV_TLSMOFF12,
-+ BFD_RELOC_FRV_TLSMOFFHI,
-+ BFD_RELOC_FRV_TLSMOFFLO,
-+ BFD_RELOC_FRV_GOTTLSOFF12,
-+ BFD_RELOC_FRV_GOTTLSOFFHI,
-+ BFD_RELOC_FRV_GOTTLSOFFLO,
-+ BFD_RELOC_FRV_TLSOFF,
-+ BFD_RELOC_FRV_TLSDESC_RELAX,
-+ BFD_RELOC_FRV_GETTLSOFF_RELAX,
-+ BFD_RELOC_FRV_TLSOFF_RELAX,
-+ BFD_RELOC_FRV_TLSMOFF,
-+
-+
-+/* This is a 24bit GOT-relative reloc for the mn10300. */
-+ BFD_RELOC_MN10300_GOTOFF24,
-+
-+/* This is a 32bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT32,
-+
-+/* This is a 24bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT24,
-+
-+/* This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes
-+in the instruction. */
-+ BFD_RELOC_MN10300_GOT16,
-+
-+/* Copy symbol at runtime. */
-+ BFD_RELOC_MN10300_COPY,
-+
-+/* Create GOT entry. */
-+ BFD_RELOC_MN10300_GLOB_DAT,
-+
-+/* Create PLT entry. */
-+ BFD_RELOC_MN10300_JMP_SLOT,
-+
-+/* Adjust by program base. */
-+ BFD_RELOC_MN10300_RELATIVE,
-+
-+
-+/* i386/elf relocations */
-+ BFD_RELOC_386_GOT32,
-+ BFD_RELOC_386_PLT32,
-+ BFD_RELOC_386_COPY,
-+ BFD_RELOC_386_GLOB_DAT,
-+ BFD_RELOC_386_JUMP_SLOT,
-+ BFD_RELOC_386_RELATIVE,
-+ BFD_RELOC_386_GOTOFF,
-+ BFD_RELOC_386_GOTPC,
-+ BFD_RELOC_386_TLS_TPOFF,
-+ BFD_RELOC_386_TLS_IE,
-+ BFD_RELOC_386_TLS_GOTIE,
-+ BFD_RELOC_386_TLS_LE,
-+ BFD_RELOC_386_TLS_GD,
-+ BFD_RELOC_386_TLS_LDM,
-+ BFD_RELOC_386_TLS_LDO_32,
-+ BFD_RELOC_386_TLS_IE_32,
-+ BFD_RELOC_386_TLS_LE_32,
-+ BFD_RELOC_386_TLS_DTPMOD32,
-+ BFD_RELOC_386_TLS_DTPOFF32,
-+ BFD_RELOC_386_TLS_TPOFF32,
-+ BFD_RELOC_386_TLS_GOTDESC,
-+ BFD_RELOC_386_TLS_DESC_CALL,
-+ BFD_RELOC_386_TLS_DESC,
-+
-+/* x86-64/elf relocations */
-+ BFD_RELOC_X86_64_GOT32,
-+ BFD_RELOC_X86_64_PLT32,
-+ BFD_RELOC_X86_64_COPY,
-+ BFD_RELOC_X86_64_GLOB_DAT,
-+ BFD_RELOC_X86_64_JUMP_SLOT,
-+ BFD_RELOC_X86_64_RELATIVE,
-+ BFD_RELOC_X86_64_GOTPCREL,
-+ BFD_RELOC_X86_64_32S,
-+ BFD_RELOC_X86_64_DTPMOD64,
-+ BFD_RELOC_X86_64_DTPOFF64,
-+ BFD_RELOC_X86_64_TPOFF64,
-+ BFD_RELOC_X86_64_TLSGD,
-+ BFD_RELOC_X86_64_TLSLD,
-+ BFD_RELOC_X86_64_DTPOFF32,
-+ BFD_RELOC_X86_64_GOTTPOFF,
-+ BFD_RELOC_X86_64_TPOFF32,
-+ BFD_RELOC_X86_64_GOTOFF64,
-+ BFD_RELOC_X86_64_GOTPC32,
-+ BFD_RELOC_X86_64_GOT64,
-+ BFD_RELOC_X86_64_GOTPCREL64,
-+ BFD_RELOC_X86_64_GOTPC64,
-+ BFD_RELOC_X86_64_GOTPLT64,
-+ BFD_RELOC_X86_64_PLTOFF64,
-+ BFD_RELOC_X86_64_GOTPC32_TLSDESC,
-+ BFD_RELOC_X86_64_TLSDESC_CALL,
-+ BFD_RELOC_X86_64_TLSDESC,
-+
-+/* ns32k relocations */
-+ BFD_RELOC_NS32K_IMM_8,
-+ BFD_RELOC_NS32K_IMM_16,
-+ BFD_RELOC_NS32K_IMM_32,
-+ BFD_RELOC_NS32K_IMM_8_PCREL,
-+ BFD_RELOC_NS32K_IMM_16_PCREL,
-+ BFD_RELOC_NS32K_IMM_32_PCREL,
-+ BFD_RELOC_NS32K_DISP_8,
-+ BFD_RELOC_NS32K_DISP_16,
-+ BFD_RELOC_NS32K_DISP_32,
-+ BFD_RELOC_NS32K_DISP_8_PCREL,
-+ BFD_RELOC_NS32K_DISP_16_PCREL,
-+ BFD_RELOC_NS32K_DISP_32_PCREL,
-+
-+/* PDP11 relocations */
-+ BFD_RELOC_PDP11_DISP_8_PCREL,
-+ BFD_RELOC_PDP11_DISP_6_PCREL,
-+
-+/* Picojava relocs. Not all of these appear in object files. */
-+ BFD_RELOC_PJ_CODE_HI16,
-+ BFD_RELOC_PJ_CODE_LO16,
-+ BFD_RELOC_PJ_CODE_DIR16,
-+ BFD_RELOC_PJ_CODE_DIR32,
-+ BFD_RELOC_PJ_CODE_REL16,
-+ BFD_RELOC_PJ_CODE_REL32,
-+
-+/* Power(rs6000) and PowerPC relocations. */
-+ BFD_RELOC_PPC_B26,
-+ BFD_RELOC_PPC_BA26,
-+ BFD_RELOC_PPC_TOC16,
-+ BFD_RELOC_PPC_B16,
-+ BFD_RELOC_PPC_B16_BRTAKEN,
-+ BFD_RELOC_PPC_B16_BRNTAKEN,
-+ BFD_RELOC_PPC_BA16,
-+ BFD_RELOC_PPC_BA16_BRTAKEN,
-+ BFD_RELOC_PPC_BA16_BRNTAKEN,
-+ BFD_RELOC_PPC_COPY,
-+ BFD_RELOC_PPC_GLOB_DAT,
-+ BFD_RELOC_PPC_JMP_SLOT,
-+ BFD_RELOC_PPC_RELATIVE,
-+ BFD_RELOC_PPC_LOCAL24PC,
-+ BFD_RELOC_PPC_EMB_NADDR32,
-+ BFD_RELOC_PPC_EMB_NADDR16,
-+ BFD_RELOC_PPC_EMB_NADDR16_LO,
-+ BFD_RELOC_PPC_EMB_NADDR16_HI,
-+ BFD_RELOC_PPC_EMB_NADDR16_HA,
-+ BFD_RELOC_PPC_EMB_SDAI16,
-+ BFD_RELOC_PPC_EMB_SDA2I16,
-+ BFD_RELOC_PPC_EMB_SDA2REL,
-+ BFD_RELOC_PPC_EMB_SDA21,
-+ BFD_RELOC_PPC_EMB_MRKREF,
-+ BFD_RELOC_PPC_EMB_RELSEC16,
-+ BFD_RELOC_PPC_EMB_RELST_LO,
-+ BFD_RELOC_PPC_EMB_RELST_HI,
-+ BFD_RELOC_PPC_EMB_RELST_HA,
-+ BFD_RELOC_PPC_EMB_BIT_FLD,
-+ BFD_RELOC_PPC_EMB_RELSDA,
-+ BFD_RELOC_PPC64_HIGHER,
-+ BFD_RELOC_PPC64_HIGHER_S,
-+ BFD_RELOC_PPC64_HIGHEST,
-+ BFD_RELOC_PPC64_HIGHEST_S,
-+ BFD_RELOC_PPC64_TOC16_LO,
-+ BFD_RELOC_PPC64_TOC16_HI,
-+ BFD_RELOC_PPC64_TOC16_HA,
-+ BFD_RELOC_PPC64_TOC,
-+ BFD_RELOC_PPC64_PLTGOT16,
-+ BFD_RELOC_PPC64_PLTGOT16_LO,
-+ BFD_RELOC_PPC64_PLTGOT16_HI,
-+ BFD_RELOC_PPC64_PLTGOT16_HA,
-+ BFD_RELOC_PPC64_ADDR16_DS,
-+ BFD_RELOC_PPC64_ADDR16_LO_DS,
-+ BFD_RELOC_PPC64_GOT16_DS,
-+ BFD_RELOC_PPC64_GOT16_LO_DS,
-+ BFD_RELOC_PPC64_PLT16_LO_DS,
-+ BFD_RELOC_PPC64_SECTOFF_DS,
-+ BFD_RELOC_PPC64_SECTOFF_LO_DS,
-+ BFD_RELOC_PPC64_TOC16_DS,
-+ BFD_RELOC_PPC64_TOC16_LO_DS,
-+ BFD_RELOC_PPC64_PLTGOT16_DS,
-+ BFD_RELOC_PPC64_PLTGOT16_LO_DS,
-+
-+/* PowerPC and PowerPC64 thread-local storage relocations. */
-+ BFD_RELOC_PPC_TLS,
-+ BFD_RELOC_PPC_DTPMOD,
-+ BFD_RELOC_PPC_TPREL16,
-+ BFD_RELOC_PPC_TPREL16_LO,
-+ BFD_RELOC_PPC_TPREL16_HI,
-+ BFD_RELOC_PPC_TPREL16_HA,
-+ BFD_RELOC_PPC_TPREL,
-+ BFD_RELOC_PPC_DTPREL16,
-+ BFD_RELOC_PPC_DTPREL16_LO,
-+ BFD_RELOC_PPC_DTPREL16_HI,
-+ BFD_RELOC_PPC_DTPREL16_HA,
-+ BFD_RELOC_PPC_DTPREL,
-+ BFD_RELOC_PPC_GOT_TLSGD16,
-+ BFD_RELOC_PPC_GOT_TLSGD16_LO,
-+ BFD_RELOC_PPC_GOT_TLSGD16_HI,
-+ BFD_RELOC_PPC_GOT_TLSGD16_HA,
-+ BFD_RELOC_PPC_GOT_TLSLD16,
-+ BFD_RELOC_PPC_GOT_TLSLD16_LO,
-+ BFD_RELOC_PPC_GOT_TLSLD16_HI,
-+ BFD_RELOC_PPC_GOT_TLSLD16_HA,
-+ BFD_RELOC_PPC_GOT_TPREL16,
-+ BFD_RELOC_PPC_GOT_TPREL16_LO,
-+ BFD_RELOC_PPC_GOT_TPREL16_HI,
-+ BFD_RELOC_PPC_GOT_TPREL16_HA,
-+ BFD_RELOC_PPC_GOT_DTPREL16,
-+ BFD_RELOC_PPC_GOT_DTPREL16_LO,
-+ BFD_RELOC_PPC_GOT_DTPREL16_HI,
-+ BFD_RELOC_PPC_GOT_DTPREL16_HA,
-+ BFD_RELOC_PPC64_TPREL16_DS,
-+ BFD_RELOC_PPC64_TPREL16_LO_DS,
-+ BFD_RELOC_PPC64_TPREL16_HIGHER,
-+ BFD_RELOC_PPC64_TPREL16_HIGHERA,
-+ BFD_RELOC_PPC64_TPREL16_HIGHEST,
-+ BFD_RELOC_PPC64_TPREL16_HIGHESTA,
-+ BFD_RELOC_PPC64_DTPREL16_DS,
-+ BFD_RELOC_PPC64_DTPREL16_LO_DS,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHER,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHERA,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHEST,
-+ BFD_RELOC_PPC64_DTPREL16_HIGHESTA,
-+
-+/* IBM 370/390 relocations */
-+ BFD_RELOC_I370_D12,
-+
-+/* The type of reloc used to build a constructor table - at the moment
-+probably a 32 bit wide absolute relocation, but the target can choose.
-+It generally does map to one of the other relocation types. */
-+ BFD_RELOC_CTOR,
-+
-+/* ARM 26 bit pc-relative branch. The lowest two bits must be zero and are
-+not stored in the instruction. */
-+ BFD_RELOC_ARM_PCREL_BRANCH,
-+
-+/* ARM 26 bit pc-relative branch. The lowest bit must be zero and is
-+not stored in the instruction. The 2nd lowest bit comes from a 1 bit
-+field in the instruction. */
-+ BFD_RELOC_ARM_PCREL_BLX,
-+
-+/* Thumb 22 bit pc-relative branch. The lowest bit must be zero and is
-+not stored in the instruction. The 2nd lowest bit comes from a 1 bit
-+field in the instruction. */
-+ BFD_RELOC_THUMB_PCREL_BLX,
-+
-+/* ARM 26-bit pc-relative branch for an unconditional BL or BLX instruction. */
-+ BFD_RELOC_ARM_PCREL_CALL,
-+
-+/* ARM 26-bit pc-relative branch for B or conditional BL instruction. */
-+ BFD_RELOC_ARM_PCREL_JUMP,
-+
-+/* Thumb 7-, 9-, 12-, 20-, 23-, and 25-bit pc-relative branches.
-+The lowest bit must be zero and is not stored in the instruction.
-+Note that the corresponding ELF R_ARM_THM_JUMPnn constant has an
-+"nn" one smaller in all cases. Note further that BRANCH23
-+corresponds to R_ARM_THM_CALL. */
-+ BFD_RELOC_THUMB_PCREL_BRANCH7,
-+ BFD_RELOC_THUMB_PCREL_BRANCH9,
-+ BFD_RELOC_THUMB_PCREL_BRANCH12,
-+ BFD_RELOC_THUMB_PCREL_BRANCH20,
-+ BFD_RELOC_THUMB_PCREL_BRANCH23,
-+ BFD_RELOC_THUMB_PCREL_BRANCH25,
-+
-+/* 12-bit immediate offset, used in ARM-format ldr and str instructions. */
-+ BFD_RELOC_ARM_OFFSET_IMM,
-+
-+/* 5-bit immediate offset, used in Thumb-format ldr and str instructions. */
-+ BFD_RELOC_ARM_THUMB_OFFSET,
-+
-+/* Pc-relative or absolute relocation depending on target. Used for
-+entries in .init_array sections. */
-+ BFD_RELOC_ARM_TARGET1,
-+
-+/* Read-only segment base relative address. */
-+ BFD_RELOC_ARM_ROSEGREL32,
-+
-+/* Data segment base relative address. */
-+ BFD_RELOC_ARM_SBREL32,
-+
-+/* This reloc is used for references to RTTI data from exception handling
-+tables. The actual definition depends on the target. It may be a
-+pc-relative or some form of GOT-indirect relocation. */
-+ BFD_RELOC_ARM_TARGET2,
-+
-+/* 31-bit PC relative address. */
-+ BFD_RELOC_ARM_PREL31,
-+
-+/* Low and High halfword relocations for MOVW and MOVT instructions. */
-+ BFD_RELOC_ARM_MOVW,
-+ BFD_RELOC_ARM_MOVT,
-+ BFD_RELOC_ARM_MOVW_PCREL,
-+ BFD_RELOC_ARM_MOVT_PCREL,
-+ BFD_RELOC_ARM_THUMB_MOVW,
-+ BFD_RELOC_ARM_THUMB_MOVT,
-+ BFD_RELOC_ARM_THUMB_MOVW_PCREL,
-+ BFD_RELOC_ARM_THUMB_MOVT_PCREL,
-+
-+/* Relocations for setting up GOTs and PLTs for shared libraries. */
-+ BFD_RELOC_ARM_JUMP_SLOT,
-+ BFD_RELOC_ARM_GLOB_DAT,
-+ BFD_RELOC_ARM_GOT32,
-+ BFD_RELOC_ARM_PLT32,
-+ BFD_RELOC_ARM_RELATIVE,
-+ BFD_RELOC_ARM_GOTOFF,
-+ BFD_RELOC_ARM_GOTPC,
-+
-+/* ARM thread-local storage relocations. */
-+ BFD_RELOC_ARM_TLS_GD32,
-+ BFD_RELOC_ARM_TLS_LDO32,
-+ BFD_RELOC_ARM_TLS_LDM32,
-+ BFD_RELOC_ARM_TLS_DTPOFF32,
-+ BFD_RELOC_ARM_TLS_DTPMOD32,
-+ BFD_RELOC_ARM_TLS_TPOFF32,
-+ BFD_RELOC_ARM_TLS_IE32,
-+ BFD_RELOC_ARM_TLS_LE32,
-+
-+/* ARM group relocations. */
-+ BFD_RELOC_ARM_ALU_PC_G0_NC,
-+ BFD_RELOC_ARM_ALU_PC_G0,
-+ BFD_RELOC_ARM_ALU_PC_G1_NC,
-+ BFD_RELOC_ARM_ALU_PC_G1,
-+ BFD_RELOC_ARM_ALU_PC_G2,
-+ BFD_RELOC_ARM_LDR_PC_G0,
-+ BFD_RELOC_ARM_LDR_PC_G1,
-+ BFD_RELOC_ARM_LDR_PC_G2,
-+ BFD_RELOC_ARM_LDRS_PC_G0,
-+ BFD_RELOC_ARM_LDRS_PC_G1,
-+ BFD_RELOC_ARM_LDRS_PC_G2,
-+ BFD_RELOC_ARM_LDC_PC_G0,
-+ BFD_RELOC_ARM_LDC_PC_G1,
-+ BFD_RELOC_ARM_LDC_PC_G2,
-+ BFD_RELOC_ARM_ALU_SB_G0_NC,
-+ BFD_RELOC_ARM_ALU_SB_G0,
-+ BFD_RELOC_ARM_ALU_SB_G1_NC,
-+ BFD_RELOC_ARM_ALU_SB_G1,
-+ BFD_RELOC_ARM_ALU_SB_G2,
-+ BFD_RELOC_ARM_LDR_SB_G0,
-+ BFD_RELOC_ARM_LDR_SB_G1,
-+ BFD_RELOC_ARM_LDR_SB_G2,
-+ BFD_RELOC_ARM_LDRS_SB_G0,
-+ BFD_RELOC_ARM_LDRS_SB_G1,
-+ BFD_RELOC_ARM_LDRS_SB_G2,
-+ BFD_RELOC_ARM_LDC_SB_G0,
-+ BFD_RELOC_ARM_LDC_SB_G1,
-+ BFD_RELOC_ARM_LDC_SB_G2,
-+
-+/* These relocs are only used within the ARM assembler. They are not
-+(at present) written to any object files. */
-+ BFD_RELOC_ARM_IMMEDIATE,
-+ BFD_RELOC_ARM_ADRL_IMMEDIATE,
-+ BFD_RELOC_ARM_T32_IMMEDIATE,
-+ BFD_RELOC_ARM_T32_ADD_IMM,
-+ BFD_RELOC_ARM_T32_IMM12,
-+ BFD_RELOC_ARM_T32_ADD_PC12,
-+ BFD_RELOC_ARM_SHIFT_IMM,
-+ BFD_RELOC_ARM_SMC,
-+ BFD_RELOC_ARM_SWI,
-+ BFD_RELOC_ARM_MULTI,
-+ BFD_RELOC_ARM_CP_OFF_IMM,
-+ BFD_RELOC_ARM_CP_OFF_IMM_S2,
-+ BFD_RELOC_ARM_T32_CP_OFF_IMM,
-+ BFD_RELOC_ARM_T32_CP_OFF_IMM_S2,
-+ BFD_RELOC_ARM_ADR_IMM,
-+ BFD_RELOC_ARM_LDR_IMM,
-+ BFD_RELOC_ARM_LITERAL,
-+ BFD_RELOC_ARM_IN_POOL,
-+ BFD_RELOC_ARM_OFFSET_IMM8,
-+ BFD_RELOC_ARM_T32_OFFSET_U8,
-+ BFD_RELOC_ARM_T32_OFFSET_IMM,
-+ BFD_RELOC_ARM_HWLITERAL,
-+ BFD_RELOC_ARM_THUMB_ADD,
-+ BFD_RELOC_ARM_THUMB_IMM,
-+ BFD_RELOC_ARM_THUMB_SHIFT,
-+
-+/* Renesas / SuperH SH relocs. Not all of these appear in object files. */
-+ BFD_RELOC_SH_PCDISP8BY2,
-+ BFD_RELOC_SH_PCDISP12BY2,
-+ BFD_RELOC_SH_IMM3,
-+ BFD_RELOC_SH_IMM3U,
-+ BFD_RELOC_SH_DISP12,
-+ BFD_RELOC_SH_DISP12BY2,
-+ BFD_RELOC_SH_DISP12BY4,
-+ BFD_RELOC_SH_DISP12BY8,
-+ BFD_RELOC_SH_DISP20,
-+ BFD_RELOC_SH_DISP20BY8,
-+ BFD_RELOC_SH_IMM4,
-+ BFD_RELOC_SH_IMM4BY2,
-+ BFD_RELOC_SH_IMM4BY4,
-+ BFD_RELOC_SH_IMM8,
-+ BFD_RELOC_SH_IMM8BY2,
-+ BFD_RELOC_SH_IMM8BY4,
-+ BFD_RELOC_SH_PCRELIMM8BY2,
-+ BFD_RELOC_SH_PCRELIMM8BY4,
-+ BFD_RELOC_SH_SWITCH16,
-+ BFD_RELOC_SH_SWITCH32,
-+ BFD_RELOC_SH_USES,
-+ BFD_RELOC_SH_COUNT,
-+ BFD_RELOC_SH_ALIGN,
-+ BFD_RELOC_SH_CODE,
-+ BFD_RELOC_SH_DATA,
-+ BFD_RELOC_SH_LABEL,
-+ BFD_RELOC_SH_LOOP_START,
-+ BFD_RELOC_SH_LOOP_END,
-+ BFD_RELOC_SH_COPY,
-+ BFD_RELOC_SH_GLOB_DAT,
-+ BFD_RELOC_SH_JMP_SLOT,
-+ BFD_RELOC_SH_RELATIVE,
-+ BFD_RELOC_SH_GOTPC,
-+ BFD_RELOC_SH_GOT_LOW16,
-+ BFD_RELOC_SH_GOT_MEDLOW16,
-+ BFD_RELOC_SH_GOT_MEDHI16,
-+ BFD_RELOC_SH_GOT_HI16,
-+ BFD_RELOC_SH_GOTPLT_LOW16,
-+ BFD_RELOC_SH_GOTPLT_MEDLOW16,
-+ BFD_RELOC_SH_GOTPLT_MEDHI16,
-+ BFD_RELOC_SH_GOTPLT_HI16,
-+ BFD_RELOC_SH_PLT_LOW16,
-+ BFD_RELOC_SH_PLT_MEDLOW16,
-+ BFD_RELOC_SH_PLT_MEDHI16,
-+ BFD_RELOC_SH_PLT_HI16,
-+ BFD_RELOC_SH_GOTOFF_LOW16,
-+ BFD_RELOC_SH_GOTOFF_MEDLOW16,
-+ BFD_RELOC_SH_GOTOFF_MEDHI16,
-+ BFD_RELOC_SH_GOTOFF_HI16,
-+ BFD_RELOC_SH_GOTPC_LOW16,
-+ BFD_RELOC_SH_GOTPC_MEDLOW16,
-+ BFD_RELOC_SH_GOTPC_MEDHI16,
-+ BFD_RELOC_SH_GOTPC_HI16,
-+ BFD_RELOC_SH_COPY64,
-+ BFD_RELOC_SH_GLOB_DAT64,
-+ BFD_RELOC_SH_JMP_SLOT64,
-+ BFD_RELOC_SH_RELATIVE64,
-+ BFD_RELOC_SH_GOT10BY4,
-+ BFD_RELOC_SH_GOT10BY8,
-+ BFD_RELOC_SH_GOTPLT10BY4,
-+ BFD_RELOC_SH_GOTPLT10BY8,
-+ BFD_RELOC_SH_GOTPLT32,
-+ BFD_RELOC_SH_SHMEDIA_CODE,
-+ BFD_RELOC_SH_IMMU5,
-+ BFD_RELOC_SH_IMMS6,
-+ BFD_RELOC_SH_IMMS6BY32,
-+ BFD_RELOC_SH_IMMU6,
-+ BFD_RELOC_SH_IMMS10,
-+ BFD_RELOC_SH_IMMS10BY2,
-+ BFD_RELOC_SH_IMMS10BY4,
-+ BFD_RELOC_SH_IMMS10BY8,
-+ BFD_RELOC_SH_IMMS16,
-+ BFD_RELOC_SH_IMMU16,
-+ BFD_RELOC_SH_IMM_LOW16,
-+ BFD_RELOC_SH_IMM_LOW16_PCREL,
-+ BFD_RELOC_SH_IMM_MEDLOW16,
-+ BFD_RELOC_SH_IMM_MEDLOW16_PCREL,
-+ BFD_RELOC_SH_IMM_MEDHI16,
-+ BFD_RELOC_SH_IMM_MEDHI16_PCREL,
-+ BFD_RELOC_SH_IMM_HI16,
-+ BFD_RELOC_SH_IMM_HI16_PCREL,
-+ BFD_RELOC_SH_PT_16,
-+ BFD_RELOC_SH_TLS_GD_32,
-+ BFD_RELOC_SH_TLS_LD_32,
-+ BFD_RELOC_SH_TLS_LDO_32,
-+ BFD_RELOC_SH_TLS_IE_32,
-+ BFD_RELOC_SH_TLS_LE_32,
-+ BFD_RELOC_SH_TLS_DTPMOD32,
-+ BFD_RELOC_SH_TLS_DTPOFF32,
-+ BFD_RELOC_SH_TLS_TPOFF32,
-+
-+/* ARC Cores relocs.
-+ARC 22 bit pc-relative branch. The lowest two bits must be zero and are
-+not stored in the instruction. The high 20 bits are installed in bits 26
-+through 7 of the instruction. */
-+ BFD_RELOC_ARC_B22_PCREL,
-+
-+/* ARC 26 bit absolute branch. The lowest two bits must be zero and are not
-+stored in the instruction. The high 24 bits are installed in bits 23
-+through 0. */
-+ BFD_RELOC_ARC_B26,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc. */
-+ BFD_RELOC_BFIN_16_IMM,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc higher 16 bits. */
-+ BFD_RELOC_BFIN_16_HIGH,
-+
-+/* ADI Blackfin 'a' part of LSETUP. */
-+ BFD_RELOC_BFIN_4_PCREL,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_5_PCREL,
-+
-+/* ADI Blackfin 16 bit immediate absolute reloc lower 16 bits. */
-+ BFD_RELOC_BFIN_16_LOW,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_10_PCREL,
-+
-+/* ADI Blackfin 'b' part of LSETUP. */
-+ BFD_RELOC_BFIN_11_PCREL,
-+
-+/* ADI Blackfin. */
-+ BFD_RELOC_BFIN_12_PCREL_JUMP,
-+
-+/* ADI Blackfin Short jump, pcrel. */
-+ BFD_RELOC_BFIN_12_PCREL_JUMP_S,
-+
-+/* ADI Blackfin Call.x not implemented. */
-+ BFD_RELOC_BFIN_24_PCREL_CALL_X,
-+
-+/* ADI Blackfin Long Jump pcrel. */
-+ BFD_RELOC_BFIN_24_PCREL_JUMP_L,
-+
-+/* ADI Blackfin FD-PIC relocations. */
-+ BFD_RELOC_BFIN_GOT17M4,
-+ BFD_RELOC_BFIN_GOTHI,
-+ BFD_RELOC_BFIN_GOTLO,
-+ BFD_RELOC_BFIN_FUNCDESC,
-+ BFD_RELOC_BFIN_FUNCDESC_GOT17M4,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTHI,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTLO,
-+ BFD_RELOC_BFIN_FUNCDESC_VALUE,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI,
-+ BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO,
-+ BFD_RELOC_BFIN_GOTOFF17M4,
-+ BFD_RELOC_BFIN_GOTOFFHI,
-+ BFD_RELOC_BFIN_GOTOFFLO,
-+
-+/* ADI Blackfin GOT relocation. */
-+ BFD_RELOC_BFIN_GOT,
-+
-+/* ADI Blackfin PLTPC relocation. */
-+ BFD_RELOC_BFIN_PLTPC,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_PUSH,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_CONST,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_ADD,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_SUB,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_MULT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_DIV,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_MOD,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LSHIFT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_RSHIFT,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_AND,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_OR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_XOR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LAND,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LOR,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_LEN,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_NEG,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_COMP,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_PAGE,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_HWPAGE,
-+
-+/* ADI Blackfin arithmetic relocation. */
-+ BFD_ARELOC_BFIN_ADDR,
-+
-+/* Mitsubishi D10V relocs.
-+This is a 10-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_10_PCREL_R,
-+
-+/* Mitsubishi D10V relocs.
-+This is a 10-bit reloc with the right 2 bits
-+assumed to be 0. This is the same as the previous reloc
-+except it is in the left container, i.e.,
-+shifted left 15 bits. */
-+ BFD_RELOC_D10V_10_PCREL_L,
-+
-+/* This is an 18-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_18,
-+
-+/* This is an 18-bit reloc with the right 2 bits
-+assumed to be 0. */
-+ BFD_RELOC_D10V_18_PCREL,
-+
-+/* Mitsubishi D30V relocs.
-+This is a 6-bit absolute reloc. */
-+ BFD_RELOC_D30V_6,
-+
-+/* This is a 6-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_9_PCREL,
-+
-+/* This is a 6-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_9_PCREL_R,
-+
-+/* This is a 12-bit absolute reloc with the
-+right 3 bitsassumed to be 0. */
-+ BFD_RELOC_D30V_15,
-+
-+/* This is a 12-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_15_PCREL,
-+
-+/* This is a 12-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_15_PCREL_R,
-+
-+/* This is an 18-bit absolute reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_21,
-+
-+/* This is an 18-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. */
-+ BFD_RELOC_D30V_21_PCREL,
-+
-+/* This is an 18-bit pc-relative reloc with
-+the right 3 bits assumed to be 0. Same
-+as the previous reloc but on the right side
-+of the container. */
-+ BFD_RELOC_D30V_21_PCREL_R,
-+
-+/* This is a 32-bit absolute reloc. */
-+ BFD_RELOC_D30V_32,
-+
-+/* This is a 32-bit pc-relative reloc. */
-+ BFD_RELOC_D30V_32_PCREL,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_HI16_S,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_LO16,
-+
-+/* DLX relocs */
-+ BFD_RELOC_DLX_JMP26,
-+
-+/* Renesas M16C/M32C Relocations. */
-+ BFD_RELOC_M32C_HI8,
-+ BFD_RELOC_M32C_RL_JUMP,
-+ BFD_RELOC_M32C_RL_1ADDR,
-+ BFD_RELOC_M32C_RL_2ADDR,
-+
-+/* Renesas M32R (formerly Mitsubishi M32R) relocs.
-+This is a 24 bit absolute address. */
-+ BFD_RELOC_M32R_24,
-+
-+/* This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_10_PCREL,
-+
-+/* This is an 18-bit reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_18_PCREL,
-+
-+/* This is a 26-bit reloc with the right 2 bits assumed to be 0. */
-+ BFD_RELOC_M32R_26_PCREL,
-+
-+/* This is a 16-bit reloc containing the high 16 bits of an address
-+used when the lower 16 bits are treated as unsigned. */
-+ BFD_RELOC_M32R_HI16_ULO,
-+
-+/* This is a 16-bit reloc containing the high 16 bits of an address
-+used when the lower 16 bits are treated as signed. */
-+ BFD_RELOC_M32R_HI16_SLO,
-+
-+/* This is a 16-bit reloc containing the lower 16 bits of an address. */
-+ BFD_RELOC_M32R_LO16,
-+
-+/* This is a 16-bit reloc containing the small data area offset for use in
-+add3, load, and store instructions. */
-+ BFD_RELOC_M32R_SDA16,
-+
-+/* For PIC. */
-+ BFD_RELOC_M32R_GOT24,
-+ BFD_RELOC_M32R_26_PLTREL,
-+ BFD_RELOC_M32R_COPY,
-+ BFD_RELOC_M32R_GLOB_DAT,
-+ BFD_RELOC_M32R_JMP_SLOT,
-+ BFD_RELOC_M32R_RELATIVE,
-+ BFD_RELOC_M32R_GOTOFF,
-+ BFD_RELOC_M32R_GOTOFF_HI_ULO,
-+ BFD_RELOC_M32R_GOTOFF_HI_SLO,
-+ BFD_RELOC_M32R_GOTOFF_LO,
-+ BFD_RELOC_M32R_GOTPC24,
-+ BFD_RELOC_M32R_GOT16_HI_ULO,
-+ BFD_RELOC_M32R_GOT16_HI_SLO,
-+ BFD_RELOC_M32R_GOT16_LO,
-+ BFD_RELOC_M32R_GOTPC_HI_ULO,
-+ BFD_RELOC_M32R_GOTPC_HI_SLO,
-+ BFD_RELOC_M32R_GOTPC_LO,
-+
-+/* This is a 9-bit reloc */
-+ BFD_RELOC_V850_9_PCREL,
-+
-+/* This is a 22-bit reloc */
-+ BFD_RELOC_V850_22_PCREL,
-+
-+/* This is a 16 bit offset from the short data area pointer. */
-+ BFD_RELOC_V850_SDA_16_16_OFFSET,
-+
-+/* This is a 16 bit offset (of which only 15 bits are used) from the
-+short data area pointer. */
-+ BFD_RELOC_V850_SDA_15_16_OFFSET,
-+
-+/* This is a 16 bit offset from the zero data area pointer. */
-+ BFD_RELOC_V850_ZDA_16_16_OFFSET,
-+
-+/* This is a 16 bit offset (of which only 15 bits are used) from the
-+zero data area pointer. */
-+ BFD_RELOC_V850_ZDA_15_16_OFFSET,
-+
-+/* This is an 8 bit offset (of which only 6 bits are used) from the
-+tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_6_8_OFFSET,
-+
-+/* This is an 8bit offset (of which only 7 bits are used) from the tiny
-+data area pointer. */
-+ BFD_RELOC_V850_TDA_7_8_OFFSET,
-+
-+/* This is a 7 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_7_7_OFFSET,
-+
-+/* This is a 16 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_16_16_OFFSET,
-+
-+/* This is a 5 bit offset (of which only 4 bits are used) from the tiny
-+data area pointer. */
-+ BFD_RELOC_V850_TDA_4_5_OFFSET,
-+
-+/* This is a 4 bit offset from the tiny data area pointer. */
-+ BFD_RELOC_V850_TDA_4_4_OFFSET,
-+
-+/* This is a 16 bit offset from the short data area pointer, with the
-+bits placed non-contiguously in the instruction. */
-+ BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET,
-+
-+/* This is a 16 bit offset from the zero data area pointer, with the
-+bits placed non-contiguously in the instruction. */
-+ BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET,
-+
-+/* This is a 6 bit offset from the call table base pointer. */
-+ BFD_RELOC_V850_CALLT_6_7_OFFSET,
-+
-+/* This is a 16 bit offset from the call table base pointer. */
-+ BFD_RELOC_V850_CALLT_16_16_OFFSET,
-+
-+/* Used for relaxing indirect function calls. */
-+ BFD_RELOC_V850_LONGCALL,
-+
-+/* Used for relaxing indirect jumps. */
-+ BFD_RELOC_V850_LONGJUMP,
-+
-+/* Used to maintain alignment whilst relaxing. */
-+ BFD_RELOC_V850_ALIGN,
-+
-+/* This is a variation of BFD_RELOC_LO16 that can be used in v850e ld.bu
-+instructions. */
-+ BFD_RELOC_V850_LO16_SPLIT_OFFSET,
-+
-+/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-+instruction. */
-+ BFD_RELOC_MN10300_32_PCREL,
-+
-+/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-+instruction. */
-+ BFD_RELOC_MN10300_16_PCREL,
-+
-+/* This is a 8bit DP reloc for the tms320c30, where the most
-+significant 8 bits of a 24 bit word are placed into the least
-+significant 8 bits of the opcode. */
-+ BFD_RELOC_TIC30_LDP,
-+
-+/* This is a 7bit reloc for the tms320c54x, where the least
-+significant 7 bits of a 16 bit word are placed into the least
-+significant 7 bits of the opcode. */
-+ BFD_RELOC_TIC54X_PARTLS7,
-+
-+/* This is a 9bit DP reloc for the tms320c54x, where the most
-+significant 9 bits of a 16 bit word are placed into the least
-+significant 9 bits of the opcode. */
-+ BFD_RELOC_TIC54X_PARTMS9,
-+
-+/* This is an extended address 23-bit reloc for the tms320c54x. */
-+ BFD_RELOC_TIC54X_23,
-+
-+/* This is a 16-bit reloc for the tms320c54x, where the least
-+significant 16 bits of a 23-bit extended address are placed into
-+the opcode. */
-+ BFD_RELOC_TIC54X_16_OF_23,
-+
-+/* This is a reloc for the tms320c54x, where the most
-+significant 7 bits of a 23-bit extended address are placed into
-+the opcode. */
-+ BFD_RELOC_TIC54X_MS7_OF_23,
-+
-+/* This is a 48 bit reloc for the FR30 that stores 32 bits. */
-+ BFD_RELOC_FR30_48,
-+
-+/* This is a 32 bit reloc for the FR30 that stores 20 bits split up into
-+two sections. */
-+ BFD_RELOC_FR30_20,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
-+4 bits. */
-+ BFD_RELOC_FR30_6_IN_4,
-+
-+/* This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_8_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_9_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
-+into 8 bits. */
-+ BFD_RELOC_FR30_10_IN_8,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
-+short offset into 8 bits. */
-+ BFD_RELOC_FR30_9_PCREL,
-+
-+/* This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
-+short offset into 11 bits. */
-+ BFD_RELOC_FR30_12_PCREL,
-+
-+/* Motorola Mcore relocations. */
-+ BFD_RELOC_MCORE_PCREL_IMM8BY4,
-+ BFD_RELOC_MCORE_PCREL_IMM11BY2,
-+ BFD_RELOC_MCORE_PCREL_IMM4BY2,
-+ BFD_RELOC_MCORE_PCREL_32,
-+ BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2,
-+ BFD_RELOC_MCORE_RVA,
-+
-+/* Toshiba Media Processor Relocations. */
-+ BFD_RELOC_MEP_8,
-+ BFD_RELOC_MEP_16,
-+ BFD_RELOC_MEP_32,
-+ BFD_RELOC_MEP_PCREL8A2,
-+ BFD_RELOC_MEP_PCREL12A2,
-+ BFD_RELOC_MEP_PCREL17A2,
-+ BFD_RELOC_MEP_PCREL24A2,
-+ BFD_RELOC_MEP_PCABS24A2,
-+ BFD_RELOC_MEP_LOW16,
-+ BFD_RELOC_MEP_HI16U,
-+ BFD_RELOC_MEP_HI16S,
-+ BFD_RELOC_MEP_GPREL,
-+ BFD_RELOC_MEP_TPREL,
-+ BFD_RELOC_MEP_TPREL7,
-+ BFD_RELOC_MEP_TPREL7A2,
-+ BFD_RELOC_MEP_TPREL7A4,
-+ BFD_RELOC_MEP_UIMM24,
-+ BFD_RELOC_MEP_ADDR24A4,
-+ BFD_RELOC_MEP_GNU_VTINHERIT,
-+ BFD_RELOC_MEP_GNU_VTENTRY,
-+
-+
-+/* These are relocations for the GETA instruction. */
-+ BFD_RELOC_MMIX_GETA,
-+ BFD_RELOC_MMIX_GETA_1,
-+ BFD_RELOC_MMIX_GETA_2,
-+ BFD_RELOC_MMIX_GETA_3,
-+
-+/* These are relocations for a conditional branch instruction. */
-+ BFD_RELOC_MMIX_CBRANCH,
-+ BFD_RELOC_MMIX_CBRANCH_J,
-+ BFD_RELOC_MMIX_CBRANCH_1,
-+ BFD_RELOC_MMIX_CBRANCH_2,
-+ BFD_RELOC_MMIX_CBRANCH_3,
-+
-+/* These are relocations for the PUSHJ instruction. */
-+ BFD_RELOC_MMIX_PUSHJ,
-+ BFD_RELOC_MMIX_PUSHJ_1,
-+ BFD_RELOC_MMIX_PUSHJ_2,
-+ BFD_RELOC_MMIX_PUSHJ_3,
-+ BFD_RELOC_MMIX_PUSHJ_STUBBABLE,
-+
-+/* These are relocations for the JMP instruction. */
-+ BFD_RELOC_MMIX_JMP,
-+ BFD_RELOC_MMIX_JMP_1,
-+ BFD_RELOC_MMIX_JMP_2,
-+ BFD_RELOC_MMIX_JMP_3,
-+
-+/* This is a relocation for a relative address as in a GETA instruction or
-+a branch. */
-+ BFD_RELOC_MMIX_ADDR19,
-+
-+/* This is a relocation for a relative address as in a JMP instruction. */
-+ BFD_RELOC_MMIX_ADDR27,
-+
-+/* This is a relocation for an instruction field that may be a general
-+register or a value 0..255. */
-+ BFD_RELOC_MMIX_REG_OR_BYTE,
-+
-+/* This is a relocation for an instruction field that may be a general
-+register. */
-+ BFD_RELOC_MMIX_REG,
-+
-+/* This is a relocation for two instruction fields holding a register and
-+an offset, the equivalent of the relocation. */
-+ BFD_RELOC_MMIX_BASE_PLUS_OFFSET,
-+
-+/* This relocation is an assertion that the expression is not allocated as
-+a global register. It does not modify contents. */
-+ BFD_RELOC_MMIX_LOCAL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit pc relative
-+short offset into 7 bits. */
-+ BFD_RELOC_AVR_7_PCREL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 13 bit pc relative
-+short offset into 12 bits. */
-+ BFD_RELOC_AVR_13_PCREL,
-+
-+/* This is a 16 bit reloc for the AVR that stores 17 bit value (usually
-+program memory address) into 16 bits. */
-+ BFD_RELOC_AVR_16_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
-+data memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_LO8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of data memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HI8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of program memory address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HH8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of 32 bit value) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_MS8_LDI,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(usually data memory address) into 8 bit immediate value of SUBI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 8 bit of data memory address) into 8 bit immediate value of
-+SUBI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(most high 8 bit of program memory address) into 8 bit immediate value
-+of LDI or SUBI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value (msb
-+of 32 bit value) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_MS8_LDI_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
-+command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value
-+(command address) into 8 bit immediate value of LDI insn. If the address
-+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
-+in the lower 128k. */
-+ BFD_RELOC_AVR_LO8_LDI_GS,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. If the address
-+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
-+below 128k. */
-+ BFD_RELOC_AVR_HI8_LDI_GS,
-+
-+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
-+of command address) into 8 bit immediate value of LDI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_PM,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(usually command address) into 8 bit immediate value of SUBI insn. */
-+ BFD_RELOC_AVR_LO8_LDI_PM_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 8 bit of 16 bit command address) into 8 bit immediate value
-+of SUBI insn. */
-+ BFD_RELOC_AVR_HI8_LDI_PM_NEG,
-+
-+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
-+(high 6 bit of 22 bit command address) into 8 bit immediate
-+value of SUBI insn. */
-+ BFD_RELOC_AVR_HH8_LDI_PM_NEG,
-+
-+/* This is a 32 bit reloc for the AVR that stores 23 bit value
-+into 22 bits. */
-+ BFD_RELOC_AVR_CALL,
-+
-+/* This is a 16 bit reloc for the AVR that stores all needed bits
-+for absolute addressing with ldi with overflow check to linktime */
-+ BFD_RELOC_AVR_LDI,
-+
-+/* This is a 6 bit reloc for the AVR that stores offset for ldd/std
-+instructions */
-+ BFD_RELOC_AVR_6,
-+
-+/* This is a 6 bit reloc for the AVR that stores offset for adiw/sbiw
-+instructions */
-+ BFD_RELOC_AVR_6_ADIW,
-+
-+/* 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,
-+
-+/* 12 bit GOT offset. */
-+ BFD_RELOC_390_GOT12,
-+
-+/* 32 bit PC relative PLT address. */
-+ BFD_RELOC_390_PLT32,
-+
-+/* Copy symbol at runtime. */
-+ BFD_RELOC_390_COPY,
-+
-+/* Create GOT entry. */
-+ BFD_RELOC_390_GLOB_DAT,
-+
-+/* Create PLT entry. */
-+ BFD_RELOC_390_JMP_SLOT,
-+
-+/* Adjust by program base. */
-+ BFD_RELOC_390_RELATIVE,
-+
-+/* 32 bit PC relative offset to GOT. */
-+ BFD_RELOC_390_GOTPC,
-+
-+/* 16 bit GOT offset. */
-+ BFD_RELOC_390_GOT16,
-+
-+/* PC relative 16 bit shifted by 1. */
-+ BFD_RELOC_390_PC16DBL,
-+
-+/* 16 bit PC rel. PLT shifted by 1. */
-+ BFD_RELOC_390_PLT16DBL,
-+
-+/* PC relative 32 bit shifted by 1. */
-+ BFD_RELOC_390_PC32DBL,
-+
-+/* 32 bit PC rel. PLT shifted by 1. */
-+ BFD_RELOC_390_PLT32DBL,
-+
-+/* 32 bit PC rel. GOT shifted by 1. */
-+ BFD_RELOC_390_GOTPCDBL,
-+
-+/* 64 bit GOT offset. */
-+ BFD_RELOC_390_GOT64,
-+
-+/* 64 bit PC relative PLT address. */
-+ BFD_RELOC_390_PLT64,
-+
-+/* 32 bit rel. offset to GOT entry. */
-+ BFD_RELOC_390_GOTENT,
-+
-+/* 64 bit offset to GOT. */
-+ BFD_RELOC_390_GOTOFF64,
-+
-+/* 12-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT12,
-+
-+/* 16-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT16,
-+
-+/* 32-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT32,
-+
-+/* 64-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLT64,
-+
-+/* 32-bit rel. offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_390_GOTPLTENT,
-+
-+/* 16-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF16,
-+
-+/* 32-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF32,
-+
-+/* 64-bit rel. offset from the GOT to a PLT entry. */
-+ BFD_RELOC_390_PLTOFF64,
-+
-+/* s390 tls relocations. */
-+ BFD_RELOC_390_TLS_LOAD,
-+ BFD_RELOC_390_TLS_GDCALL,
-+ BFD_RELOC_390_TLS_LDCALL,
-+ BFD_RELOC_390_TLS_GD32,
-+ BFD_RELOC_390_TLS_GD64,
-+ BFD_RELOC_390_TLS_GOTIE12,
-+ BFD_RELOC_390_TLS_GOTIE32,
-+ BFD_RELOC_390_TLS_GOTIE64,
-+ BFD_RELOC_390_TLS_LDM32,
-+ BFD_RELOC_390_TLS_LDM64,
-+ BFD_RELOC_390_TLS_IE32,
-+ BFD_RELOC_390_TLS_IE64,
-+ BFD_RELOC_390_TLS_IEENT,
-+ BFD_RELOC_390_TLS_LE32,
-+ BFD_RELOC_390_TLS_LE64,
-+ BFD_RELOC_390_TLS_LDO32,
-+ BFD_RELOC_390_TLS_LDO64,
-+ BFD_RELOC_390_TLS_DTPMOD,
-+ BFD_RELOC_390_TLS_DTPOFF,
-+ BFD_RELOC_390_TLS_TPOFF,
-+
-+/* Long displacement extension. */
-+ BFD_RELOC_390_20,
-+ BFD_RELOC_390_GOT20,
-+ BFD_RELOC_390_GOTPLT20,
-+ BFD_RELOC_390_TLS_GOTIE20,
-+
-+/* Score relocations */
-+ BFD_RELOC_SCORE_DUMMY1,
-+
-+/* Low 16 bit for load/store */
-+ BFD_RELOC_SCORE_GPREL15,
-+
-+/* This is a 24-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE_DUMMY2,
-+ BFD_RELOC_SCORE_JMP,
-+
-+/* This is a 19-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE_BRANCH,
-+
-+/* This is a 11-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE16_JMP,
-+
-+/* This is a 8-bit reloc with the right 1 bit assumed to be 0 */
-+ BFD_RELOC_SCORE16_BRANCH,
-+
-+/* Undocumented Score relocs */
-+ BFD_RELOC_SCORE_GOT15,
-+ BFD_RELOC_SCORE_GOT_LO16,
-+ BFD_RELOC_SCORE_CALL15,
-+ BFD_RELOC_SCORE_DUMMY_HI16,
-+
-+/* Scenix IP2K - 9-bit register number / data address */
-+ BFD_RELOC_IP2K_FR9,
-+
-+/* Scenix IP2K - 4-bit register/data bank number */
-+ BFD_RELOC_IP2K_BANK,
-+
-+/* Scenix IP2K - low 13 bits of instruction word address */
-+ BFD_RELOC_IP2K_ADDR16CJP,
-+
-+/* Scenix IP2K - high 3 bits of instruction word address */
-+ BFD_RELOC_IP2K_PAGE3,
-+
-+/* Scenix IP2K - ext/low/high 8 bits of data address */
-+ BFD_RELOC_IP2K_LO8DATA,
-+ BFD_RELOC_IP2K_HI8DATA,
-+ BFD_RELOC_IP2K_EX8DATA,
-+
-+/* Scenix IP2K - low/high 8 bits of instruction word address */
-+ BFD_RELOC_IP2K_LO8INSN,
-+ BFD_RELOC_IP2K_HI8INSN,
-+
-+/* Scenix IP2K - even/odd PC modifier to modify snb pcl.0 */
-+ BFD_RELOC_IP2K_PC_SKIP,
-+
-+/* Scenix IP2K - 16 bit word address in text section. */
-+ BFD_RELOC_IP2K_TEXT,
-+
-+/* Scenix IP2K - 7-bit sp or dp offset */
-+ BFD_RELOC_IP2K_FR_OFFSET,
-+
-+/* Scenix VPE4K coprocessor - data/insn-space addressing */
-+ BFD_RELOC_VPE4KMATH_DATA,
-+ BFD_RELOC_VPE4KMATH_INSN,
-+
-+/* These two relocations are used by the linker to determine which of
-+the entries in a C++ virtual function table are actually used. When
-+the --gc-sections option is given, the linker will zero out the entries
-+that are not used, so that the code for those functions need not be
-+included in the output.
-+
-+VTABLE_INHERIT is a zero-space relocation used to describe to the
-+linker the inheritance tree of a C++ virtual function table. The
-+relocation's symbol should be the parent class' vtable, and the
-+relocation should be located at the child vtable.
-+
-+VTABLE_ENTRY is a zero-space relocation that describes the use of a
-+virtual function table entry. The reloc's symbol should refer to the
-+table of the class mentioned in the code. Off of that base, an offset
-+describes the entry that is being used. For Rela hosts, this offset
-+is stored in the reloc's addend. For Rel hosts, we are forced to put
-+this offset in the reloc's section offset. */
-+ BFD_RELOC_VTABLE_INHERIT,
-+ BFD_RELOC_VTABLE_ENTRY,
-+
-+/* Intel IA64 Relocations. */
-+ BFD_RELOC_IA64_IMM14,
-+ BFD_RELOC_IA64_IMM22,
-+ BFD_RELOC_IA64_IMM64,
-+ BFD_RELOC_IA64_DIR32MSB,
-+ BFD_RELOC_IA64_DIR32LSB,
-+ BFD_RELOC_IA64_DIR64MSB,
-+ BFD_RELOC_IA64_DIR64LSB,
-+ BFD_RELOC_IA64_GPREL22,
-+ BFD_RELOC_IA64_GPREL64I,
-+ BFD_RELOC_IA64_GPREL32MSB,
-+ BFD_RELOC_IA64_GPREL32LSB,
-+ BFD_RELOC_IA64_GPREL64MSB,
-+ BFD_RELOC_IA64_GPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF22,
-+ BFD_RELOC_IA64_LTOFF64I,
-+ BFD_RELOC_IA64_PLTOFF22,
-+ BFD_RELOC_IA64_PLTOFF64I,
-+ BFD_RELOC_IA64_PLTOFF64MSB,
-+ BFD_RELOC_IA64_PLTOFF64LSB,
-+ BFD_RELOC_IA64_FPTR64I,
-+ BFD_RELOC_IA64_FPTR32MSB,
-+ BFD_RELOC_IA64_FPTR32LSB,
-+ BFD_RELOC_IA64_FPTR64MSB,
-+ BFD_RELOC_IA64_FPTR64LSB,
-+ BFD_RELOC_IA64_PCREL21B,
-+ BFD_RELOC_IA64_PCREL21BI,
-+ BFD_RELOC_IA64_PCREL21M,
-+ BFD_RELOC_IA64_PCREL21F,
-+ BFD_RELOC_IA64_PCREL22,
-+ BFD_RELOC_IA64_PCREL60B,
-+ BFD_RELOC_IA64_PCREL64I,
-+ BFD_RELOC_IA64_PCREL32MSB,
-+ BFD_RELOC_IA64_PCREL32LSB,
-+ BFD_RELOC_IA64_PCREL64MSB,
-+ BFD_RELOC_IA64_PCREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR22,
-+ BFD_RELOC_IA64_LTOFF_FPTR64I,
-+ BFD_RELOC_IA64_LTOFF_FPTR32MSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR32LSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR64MSB,
-+ BFD_RELOC_IA64_LTOFF_FPTR64LSB,
-+ BFD_RELOC_IA64_SEGREL32MSB,
-+ BFD_RELOC_IA64_SEGREL32LSB,
-+ BFD_RELOC_IA64_SEGREL64MSB,
-+ BFD_RELOC_IA64_SEGREL64LSB,
-+ BFD_RELOC_IA64_SECREL32MSB,
-+ BFD_RELOC_IA64_SECREL32LSB,
-+ BFD_RELOC_IA64_SECREL64MSB,
-+ BFD_RELOC_IA64_SECREL64LSB,
-+ BFD_RELOC_IA64_REL32MSB,
-+ BFD_RELOC_IA64_REL32LSB,
-+ BFD_RELOC_IA64_REL64MSB,
-+ BFD_RELOC_IA64_REL64LSB,
-+ BFD_RELOC_IA64_LTV32MSB,
-+ BFD_RELOC_IA64_LTV32LSB,
-+ BFD_RELOC_IA64_LTV64MSB,
-+ BFD_RELOC_IA64_LTV64LSB,
-+ BFD_RELOC_IA64_IPLTMSB,
-+ BFD_RELOC_IA64_IPLTLSB,
-+ BFD_RELOC_IA64_COPY,
-+ BFD_RELOC_IA64_LTOFF22X,
-+ BFD_RELOC_IA64_LDXMOV,
-+ BFD_RELOC_IA64_TPREL14,
-+ BFD_RELOC_IA64_TPREL22,
-+ BFD_RELOC_IA64_TPREL64I,
-+ BFD_RELOC_IA64_TPREL64MSB,
-+ BFD_RELOC_IA64_TPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_TPREL22,
-+ BFD_RELOC_IA64_DTPMOD64MSB,
-+ BFD_RELOC_IA64_DTPMOD64LSB,
-+ BFD_RELOC_IA64_LTOFF_DTPMOD22,
-+ BFD_RELOC_IA64_DTPREL14,
-+ BFD_RELOC_IA64_DTPREL22,
-+ BFD_RELOC_IA64_DTPREL64I,
-+ BFD_RELOC_IA64_DTPREL32MSB,
-+ BFD_RELOC_IA64_DTPREL32LSB,
-+ BFD_RELOC_IA64_DTPREL64MSB,
-+ BFD_RELOC_IA64_DTPREL64LSB,
-+ BFD_RELOC_IA64_LTOFF_DTPREL22,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 8 bit high part of an absolute address. */
-+ BFD_RELOC_M68HC11_HI8,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 8 bit low part of an absolute address. */
-+ BFD_RELOC_M68HC11_LO8,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 3 bit of a value. */
-+ BFD_RELOC_M68HC11_3B,
-+
-+/* Motorola 68HC11 reloc.
-+This reloc marks the beginning of a jump/call instruction.
-+It is used for linker relaxation to correctly identify beginning
-+of instruction and change some branches to use PC-relative
-+addressing mode. */
-+ BFD_RELOC_M68HC11_RL_JUMP,
-+
-+/* Motorola 68HC11 reloc.
-+This reloc marks a group of several instructions that gcc generates
-+and for which the linker relaxation pass can modify and/or remove
-+some of them. */
-+ BFD_RELOC_M68HC11_RL_GROUP,
-+
-+/* Motorola 68HC11 reloc.
-+This is the 16-bit lower part of an address. It is used for 'call'
-+instruction to specify the symbol address without any special
-+transformation (due to memory bank window). */
-+ BFD_RELOC_M68HC11_LO16,
-+
-+/* Motorola 68HC11 reloc.
-+This is a 8-bit reloc that specifies the page number of an address.
-+It is used by 'call' instruction to specify the page number of
-+the symbol. */
-+ BFD_RELOC_M68HC11_PAGE,
-+
-+/* Motorola 68HC11 reloc.
-+This is a 24-bit reloc that represents the address with a 16-bit
-+value and a 8-bit page number. The symbol address is transformed
-+to follow the 16K memory bank of 68HC12 (seen as mapped in the window). */
-+ BFD_RELOC_M68HC11_24,
-+
-+/* Motorola 68HC12 reloc.
-+This is the 5 bits of a value. */
-+ BFD_RELOC_M68HC12_5B,
-+
-+/* NS CR16C Relocations. */
-+ BFD_RELOC_16C_NUM08,
-+ BFD_RELOC_16C_NUM08_C,
-+ BFD_RELOC_16C_NUM16,
-+ BFD_RELOC_16C_NUM16_C,
-+ BFD_RELOC_16C_NUM32,
-+ BFD_RELOC_16C_NUM32_C,
-+ BFD_RELOC_16C_DISP04,
-+ BFD_RELOC_16C_DISP04_C,
-+ BFD_RELOC_16C_DISP08,
-+ BFD_RELOC_16C_DISP08_C,
-+ BFD_RELOC_16C_DISP16,
-+ BFD_RELOC_16C_DISP16_C,
-+ BFD_RELOC_16C_DISP24,
-+ BFD_RELOC_16C_DISP24_C,
-+ BFD_RELOC_16C_DISP24a,
-+ BFD_RELOC_16C_DISP24a_C,
-+ BFD_RELOC_16C_REG04,
-+ BFD_RELOC_16C_REG04_C,
-+ BFD_RELOC_16C_REG04a,
-+ BFD_RELOC_16C_REG04a_C,
-+ BFD_RELOC_16C_REG14,
-+ BFD_RELOC_16C_REG14_C,
-+ BFD_RELOC_16C_REG16,
-+ BFD_RELOC_16C_REG16_C,
-+ BFD_RELOC_16C_REG20,
-+ BFD_RELOC_16C_REG20_C,
-+ BFD_RELOC_16C_ABS20,
-+ BFD_RELOC_16C_ABS20_C,
-+ BFD_RELOC_16C_ABS24,
-+ BFD_RELOC_16C_ABS24_C,
-+ BFD_RELOC_16C_IMM04,
-+ BFD_RELOC_16C_IMM04_C,
-+ BFD_RELOC_16C_IMM16,
-+ BFD_RELOC_16C_IMM16_C,
-+ BFD_RELOC_16C_IMM20,
-+ BFD_RELOC_16C_IMM20_C,
-+ BFD_RELOC_16C_IMM24,
-+ BFD_RELOC_16C_IMM24_C,
-+ BFD_RELOC_16C_IMM32,
-+ BFD_RELOC_16C_IMM32_C,
-+
-+/* NS CR16 Relocations. */
-+ BFD_RELOC_CR16_NUM8,
-+ BFD_RELOC_CR16_NUM16,
-+ BFD_RELOC_CR16_NUM32,
-+ BFD_RELOC_CR16_NUM32a,
-+ BFD_RELOC_CR16_REGREL0,
-+ BFD_RELOC_CR16_REGREL4,
-+ BFD_RELOC_CR16_REGREL4a,
-+ BFD_RELOC_CR16_REGREL14,
-+ BFD_RELOC_CR16_REGREL14a,
-+ BFD_RELOC_CR16_REGREL16,
-+ BFD_RELOC_CR16_REGREL20,
-+ BFD_RELOC_CR16_REGREL20a,
-+ BFD_RELOC_CR16_ABS20,
-+ BFD_RELOC_CR16_ABS24,
-+ BFD_RELOC_CR16_IMM4,
-+ BFD_RELOC_CR16_IMM8,
-+ BFD_RELOC_CR16_IMM16,
-+ BFD_RELOC_CR16_IMM20,
-+ BFD_RELOC_CR16_IMM24,
-+ BFD_RELOC_CR16_IMM32,
-+ BFD_RELOC_CR16_IMM32a,
-+ BFD_RELOC_CR16_DISP4,
-+ BFD_RELOC_CR16_DISP8,
-+ BFD_RELOC_CR16_DISP16,
-+ BFD_RELOC_CR16_DISP20,
-+ BFD_RELOC_CR16_DISP24,
-+ BFD_RELOC_CR16_DISP24a,
-+
-+/* NS CRX Relocations. */
-+ BFD_RELOC_CRX_REL4,
-+ BFD_RELOC_CRX_REL8,
-+ BFD_RELOC_CRX_REL8_CMP,
-+ BFD_RELOC_CRX_REL16,
-+ BFD_RELOC_CRX_REL24,
-+ BFD_RELOC_CRX_REL32,
-+ BFD_RELOC_CRX_REGREL12,
-+ BFD_RELOC_CRX_REGREL22,
-+ BFD_RELOC_CRX_REGREL28,
-+ BFD_RELOC_CRX_REGREL32,
-+ BFD_RELOC_CRX_ABS16,
-+ BFD_RELOC_CRX_ABS32,
-+ BFD_RELOC_CRX_NUM8,
-+ BFD_RELOC_CRX_NUM16,
-+ BFD_RELOC_CRX_NUM32,
-+ BFD_RELOC_CRX_IMM16,
-+ BFD_RELOC_CRX_IMM32,
-+ BFD_RELOC_CRX_SWITCH8,
-+ BFD_RELOC_CRX_SWITCH16,
-+ BFD_RELOC_CRX_SWITCH32,
-+
-+/* These relocs are only used within the CRIS assembler. They are not
-+(at present) written to any object files. */
-+ BFD_RELOC_CRIS_BDISP8,
-+ BFD_RELOC_CRIS_UNSIGNED_5,
-+ BFD_RELOC_CRIS_SIGNED_6,
-+ BFD_RELOC_CRIS_UNSIGNED_6,
-+ BFD_RELOC_CRIS_SIGNED_8,
-+ BFD_RELOC_CRIS_UNSIGNED_8,
-+ BFD_RELOC_CRIS_SIGNED_16,
-+ BFD_RELOC_CRIS_UNSIGNED_16,
-+ BFD_RELOC_CRIS_LAPCQ_OFFSET,
-+ BFD_RELOC_CRIS_UNSIGNED_4,
-+
-+/* Relocs used in ELF shared libraries for CRIS. */
-+ BFD_RELOC_CRIS_COPY,
-+ BFD_RELOC_CRIS_GLOB_DAT,
-+ BFD_RELOC_CRIS_JUMP_SLOT,
-+ BFD_RELOC_CRIS_RELATIVE,
-+
-+/* 32-bit offset to symbol-entry within GOT. */
-+ BFD_RELOC_CRIS_32_GOT,
-+
-+/* 16-bit offset to symbol-entry within GOT. */
-+ BFD_RELOC_CRIS_16_GOT,
-+
-+/* 32-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_CRIS_32_GOTPLT,
-+
-+/* 16-bit offset to symbol-entry within GOT, with PLT handling. */
-+ BFD_RELOC_CRIS_16_GOTPLT,
-+
-+/* 32-bit offset to symbol, relative to GOT. */
-+ BFD_RELOC_CRIS_32_GOTREL,
-+
-+/* 32-bit offset to symbol with PLT entry, relative to GOT. */
-+ BFD_RELOC_CRIS_32_PLT_GOTREL,
-+
-+/* 32-bit offset to symbol with PLT entry, relative to this relocation. */
-+ BFD_RELOC_CRIS_32_PLT_PCREL,
-+
-+/* Intel i860 Relocations. */
-+ BFD_RELOC_860_COPY,
-+ BFD_RELOC_860_GLOB_DAT,
-+ BFD_RELOC_860_JUMP_SLOT,
-+ BFD_RELOC_860_RELATIVE,
-+ BFD_RELOC_860_PC26,
-+ BFD_RELOC_860_PLT26,
-+ BFD_RELOC_860_PC16,
-+ BFD_RELOC_860_LOW0,
-+ BFD_RELOC_860_SPLIT0,
-+ BFD_RELOC_860_LOW1,
-+ BFD_RELOC_860_SPLIT1,
-+ BFD_RELOC_860_LOW2,
-+ BFD_RELOC_860_SPLIT2,
-+ BFD_RELOC_860_LOW3,
-+ BFD_RELOC_860_LOGOT0,
-+ BFD_RELOC_860_SPGOT0,
-+ BFD_RELOC_860_LOGOT1,
-+ BFD_RELOC_860_SPGOT1,
-+ BFD_RELOC_860_LOGOTOFF0,
-+ BFD_RELOC_860_SPGOTOFF0,
-+ BFD_RELOC_860_LOGOTOFF1,
-+ BFD_RELOC_860_SPGOTOFF1,
-+ BFD_RELOC_860_LOGOTOFF2,
-+ BFD_RELOC_860_LOGOTOFF3,
-+ BFD_RELOC_860_LOPC,
-+ BFD_RELOC_860_HIGHADJ,
-+ BFD_RELOC_860_HAGOT,
-+ BFD_RELOC_860_HAGOTOFF,
-+ BFD_RELOC_860_HAPC,
-+ BFD_RELOC_860_HIGH,
-+ BFD_RELOC_860_HIGOT,
-+ BFD_RELOC_860_HIGOTOFF,
-+
-+/* OpenRISC Relocations. */
-+ BFD_RELOC_OPENRISC_ABS_26,
-+ BFD_RELOC_OPENRISC_REL_26,
-+
-+/* H8 elf Relocations. */
-+ BFD_RELOC_H8_DIR16A8,
-+ BFD_RELOC_H8_DIR16R8,
-+ BFD_RELOC_H8_DIR24A8,
-+ BFD_RELOC_H8_DIR24R8,
-+ BFD_RELOC_H8_DIR32A16,
-+
-+/* Sony Xstormy16 Relocations. */
-+ BFD_RELOC_XSTORMY16_REL_12,
-+ BFD_RELOC_XSTORMY16_12,
-+ BFD_RELOC_XSTORMY16_24,
-+ BFD_RELOC_XSTORMY16_FPTR16,
-+
-+/* Self-describing complex relocations. */
-+ BFD_RELOC_RELC,
-+
-+
-+/* Infineon Relocations. */
-+ BFD_RELOC_XC16X_PAG,
-+ BFD_RELOC_XC16X_POF,
-+ BFD_RELOC_XC16X_SEG,
-+ BFD_RELOC_XC16X_SOF,
-+
-+/* Relocations used by VAX ELF. */
-+ BFD_RELOC_VAX_GLOB_DAT,
-+ BFD_RELOC_VAX_JMP_SLOT,
-+ BFD_RELOC_VAX_RELATIVE,
-+
-+/* Morpho MT - 16 bit immediate relocation. */
-+ BFD_RELOC_MT_PC16,
-+
-+/* Morpho MT - Hi 16 bits of an address. */
-+ BFD_RELOC_MT_HI16,
-+
-+/* Morpho MT - Low 16 bits of an address. */
-+ BFD_RELOC_MT_LO16,
-+
-+/* Morpho MT - Used to tell the linker which vtable entries are used. */
-+ BFD_RELOC_MT_GNU_VTINHERIT,
-+
-+/* Morpho MT - Used to tell the linker which vtable entries are used. */
-+ BFD_RELOC_MT_GNU_VTENTRY,
-+
-+/* Morpho MT - 8 bit immediate relocation. */
-+ BFD_RELOC_MT_PCINSN8,
-+
-+/* msp430 specific relocation codes */
-+ BFD_RELOC_MSP430_10_PCREL,
-+ BFD_RELOC_MSP430_16_PCREL,
-+ BFD_RELOC_MSP430_16,
-+ BFD_RELOC_MSP430_16_PCREL_BYTE,
-+ BFD_RELOC_MSP430_16_BYTE,
-+ BFD_RELOC_MSP430_2X_PCREL,
-+ BFD_RELOC_MSP430_RL_PCREL,
-+
-+/* IQ2000 Relocations. */
-+ BFD_RELOC_IQ2000_OFFSET_16,
-+ BFD_RELOC_IQ2000_OFFSET_21,
-+ BFD_RELOC_IQ2000_UHI16,
-+
-+/* Special Xtensa relocation used only by PLT entries in ELF shared
-+objects to indicate that the runtime linker should set the value
-+to one of its own internal functions or data structures. */
-+ BFD_RELOC_XTENSA_RTLD,
-+
-+/* Xtensa relocations for ELF shared objects. */
-+ BFD_RELOC_XTENSA_GLOB_DAT,
-+ BFD_RELOC_XTENSA_JMP_SLOT,
-+ BFD_RELOC_XTENSA_RELATIVE,
-+
-+/* Xtensa relocation used in ELF object files for symbols that may require
-+PLT entries. Otherwise, this is just a generic 32-bit relocation. */
-+ BFD_RELOC_XTENSA_PLT,
-+
-+/* Xtensa relocations to mark the difference of two local symbols.
-+These are only needed to support linker relaxation and can be ignored
-+when not relaxing. The field is set to the value of the difference
-+assuming no relaxation. The relocation encodes the position of the
-+first symbol so the linker can determine whether to adjust the field
-+value. */
-+ BFD_RELOC_XTENSA_DIFF8,
-+ BFD_RELOC_XTENSA_DIFF16,
-+ BFD_RELOC_XTENSA_DIFF32,
-+
-+/* Generic Xtensa relocations for instruction operands. Only the slot
-+number is encoded in the relocation. The relocation applies to the
-+last PC-relative immediate operand, or if there are no PC-relative
-+immediates, to the last immediate operand. */
-+ BFD_RELOC_XTENSA_SLOT0_OP,
-+ BFD_RELOC_XTENSA_SLOT1_OP,
-+ BFD_RELOC_XTENSA_SLOT2_OP,
-+ BFD_RELOC_XTENSA_SLOT3_OP,
-+ BFD_RELOC_XTENSA_SLOT4_OP,
-+ BFD_RELOC_XTENSA_SLOT5_OP,
-+ BFD_RELOC_XTENSA_SLOT6_OP,
-+ BFD_RELOC_XTENSA_SLOT7_OP,
-+ BFD_RELOC_XTENSA_SLOT8_OP,
-+ BFD_RELOC_XTENSA_SLOT9_OP,
-+ BFD_RELOC_XTENSA_SLOT10_OP,
-+ BFD_RELOC_XTENSA_SLOT11_OP,
-+ BFD_RELOC_XTENSA_SLOT12_OP,
-+ BFD_RELOC_XTENSA_SLOT13_OP,
-+ BFD_RELOC_XTENSA_SLOT14_OP,
-+
-+/* Alternate Xtensa relocations. Only the slot is encoded in the
-+relocation. The meaning of these relocations is opcode-specific. */
-+ BFD_RELOC_XTENSA_SLOT0_ALT,
-+ BFD_RELOC_XTENSA_SLOT1_ALT,
-+ BFD_RELOC_XTENSA_SLOT2_ALT,
-+ BFD_RELOC_XTENSA_SLOT3_ALT,
-+ BFD_RELOC_XTENSA_SLOT4_ALT,
-+ BFD_RELOC_XTENSA_SLOT5_ALT,
-+ BFD_RELOC_XTENSA_SLOT6_ALT,
-+ BFD_RELOC_XTENSA_SLOT7_ALT,
-+ BFD_RELOC_XTENSA_SLOT8_ALT,
-+ BFD_RELOC_XTENSA_SLOT9_ALT,
-+ BFD_RELOC_XTENSA_SLOT10_ALT,
-+ BFD_RELOC_XTENSA_SLOT11_ALT,
-+ BFD_RELOC_XTENSA_SLOT12_ALT,
-+ BFD_RELOC_XTENSA_SLOT13_ALT,
-+ BFD_RELOC_XTENSA_SLOT14_ALT,
-+
-+/* Xtensa relocations for backward compatibility. These have all been
-+replaced by BFD_RELOC_XTENSA_SLOT0_OP. */
-+ BFD_RELOC_XTENSA_OP0,
-+ BFD_RELOC_XTENSA_OP1,
-+ BFD_RELOC_XTENSA_OP2,
-+
-+/* Xtensa relocation to mark that the assembler expanded the
-+instructions from an original target. The expansion size is
-+encoded in the reloc size. */
-+ BFD_RELOC_XTENSA_ASM_EXPAND,
-+
-+/* Xtensa relocation to mark that the linker should simplify
-+assembler-expanded instructions. This is commonly used
-+internally by the linker after analysis of a
-+BFD_RELOC_XTENSA_ASM_EXPAND. */
-+ BFD_RELOC_XTENSA_ASM_SIMPLIFY,
-+
-+/* 8 bit signed offset in (ix+d) or (iy+d). */
-+ BFD_RELOC_Z80_DISP8,
-+
-+/* DJNZ offset. */
-+ BFD_RELOC_Z8K_DISP7,
-+
-+/* CALR offset. */
-+ BFD_RELOC_Z8K_CALLR,
-+
-+/* 4 bit value. */
-+ BFD_RELOC_Z8K_IMM4L,
-+ BFD_RELOC_UNUSED };
-+typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
-+reloc_howto_type *bfd_reloc_type_lookup
-+ (bfd *abfd, bfd_reloc_code_real_type code);
-+reloc_howto_type *bfd_reloc_name_lookup
-+ (bfd *abfd, const char *reloc_name);
-+
-+const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code);
-+
-+/* Extracted from syms.c. */
-+
-+typedef struct bfd_symbol
-+{
-+ /* A pointer to the BFD which owns the symbol. This information
-+ is necessary so that a back end can work out what additional
-+ information (invisible to the application writer) is carried
-+ with the symbol.
-+
-+ This field is *almost* redundant, since you can use section->owner
-+ instead, except that some symbols point to the global sections
-+ bfd_{abs,com,und}_section. This could be fixed by making
-+ these globals be per-bfd (or per-target-flavor). FIXME. */
-+ struct bfd *the_bfd; /* Use bfd_asymbol_bfd(sym) to access this field. */
-+
-+ /* The text of the symbol. The name is left alone, and not copied; the
-+ application may not alter it. */
-+ const char *name;
-+
-+ /* The value of the symbol. This really should be a union of a
-+ numeric value with a pointer, since some flags indicate that
-+ a pointer to another symbol is stored here. */
-+ symvalue value;
-+
-+ /* Attributes of a symbol. */
-+#define BSF_NO_FLAGS 0x00
-+
-+ /* The symbol has local scope; <<static>> in <<C>>. The value
-+ is the offset into the section of the data. */
-+#define BSF_LOCAL 0x01
-+
-+ /* The symbol has global scope; initialized data in <<C>>. The
-+ value is the offset into the section of the data. */
-+#define BSF_GLOBAL 0x02
-+
-+ /* The symbol has global scope and is exported. The value is
-+ the offset into the section of the data. */
-+#define BSF_EXPORT BSF_GLOBAL /* No real difference. */
-+
-+ /* A normal C symbol would be one of:
-+ <<BSF_LOCAL>>, <<BSF_FORT_COMM>>, <<BSF_UNDEFINED>> or
-+ <<BSF_GLOBAL>>. */
-+
-+ /* The symbol is a debugging record. The value has an arbitrary
-+ meaning, unless BSF_DEBUGGING_RELOC is also set. */
-+#define BSF_DEBUGGING 0x08
-+
-+ /* The symbol denotes a function entry point. Used in ELF,
-+ perhaps others someday. */
-+#define BSF_FUNCTION 0x10
-+
-+ /* Used by the linker. */
-+#define BSF_KEEP 0x20
-+#define BSF_KEEP_G 0x40
-+
-+ /* A weak global symbol, overridable without warnings by
-+ a regular global symbol of the same name. */
-+#define BSF_WEAK 0x80
-+
-+ /* This symbol was created to point to a section, e.g. ELF's
-+ STT_SECTION symbols. */
-+#define BSF_SECTION_SYM 0x100
-+
-+ /* The symbol used to be a common symbol, but now it is
-+ allocated. */
-+#define BSF_OLD_COMMON 0x200
-+
-+ /* The default value for common data. */
-+#define BFD_FORT_COMM_DEFAULT_VALUE 0
-+
-+ /* In some files the type of a symbol sometimes alters its
-+ location in an output file - ie in coff a <<ISFCN>> symbol
-+ which is also <<C_EXT>> symbol appears where it was
-+ declared and not at the end of a section. This bit is set
-+ by the target BFD part to convey this information. */
-+#define BSF_NOT_AT_END 0x400
-+
-+ /* Signal that the symbol is the label of constructor section. */
-+#define BSF_CONSTRUCTOR 0x800
-+
-+ /* Signal that the symbol is a warning symbol. The name is a
-+ warning. The name of the next symbol is the one to warn about;
-+ if a reference is made to a symbol with the same name as the next
-+ symbol, a warning is issued by the linker. */
-+#define BSF_WARNING 0x1000
-+
-+ /* Signal that the symbol is indirect. This symbol is an indirect
-+ pointer to the symbol with the same name as the next symbol. */
-+#define BSF_INDIRECT 0x2000
-+
-+ /* BSF_FILE marks symbols that contain a file name. This is used
-+ for ELF STT_FILE symbols. */
-+#define BSF_FILE 0x4000
-+
-+ /* Symbol is from dynamic linking information. */
-+#define BSF_DYNAMIC 0x8000
-+
-+ /* The symbol denotes a data object. Used in ELF, and perhaps
-+ others someday. */
-+#define BSF_OBJECT 0x10000
-+
-+ /* This symbol is a debugging symbol. The value is the offset
-+ into the section of the data. BSF_DEBUGGING should be set
-+ as well. */
-+#define BSF_DEBUGGING_RELOC 0x20000
-+
-+ /* This symbol is thread local. Used in ELF. */
-+#define BSF_THREAD_LOCAL 0x40000
-+
-+ /* This symbol represents a complex relocation expression,
-+ with the expression tree serialized in the symbol name. */
-+#define BSF_RELC 0x80000
-+
-+ /* This symbol represents a signed complex relocation expression,
-+ with the expression tree serialized in the symbol name. */
-+#define BSF_SRELC 0x100000
-+
-+ flagword flags;
-+
-+ /* A pointer to the section to which this symbol is
-+ relative. This will always be non NULL, there are special
-+ sections for undefined and absolute symbols. */
-+ struct bfd_section *section;
-+
-+ /* Back end special data. */
-+ union
-+ {
-+ void *p;
-+ bfd_vma i;
-+ }
-+ udata;
-+}
-+asymbol;
-+
-+#define bfd_get_symtab_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
-+
-+bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym);
-+
-+bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
-+
-+#define bfd_is_local_label_name(abfd, name) \
-+ BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
-+
-+bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym);
-+
-+#define bfd_is_target_special_symbol(abfd, sym) \
-+ BFD_SEND (abfd, _bfd_is_target_special_symbol, (abfd, sym))
-+
-+#define bfd_canonicalize_symtab(abfd, location) \
-+ BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location))
-+
-+bfd_boolean bfd_set_symtab
-+ (bfd *abfd, asymbol **location, unsigned int count);
-+
-+void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol);
-+
-+#define bfd_make_empty_symbol(abfd) \
-+ BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
-+
-+asymbol *_bfd_generic_make_empty_symbol (bfd *);
-+
-+#define bfd_make_debug_symbol(abfd,ptr,size) \
-+ BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
-+
-+int bfd_decode_symclass (asymbol *symbol);
-+
-+bfd_boolean bfd_is_undefined_symclass (int symclass);
-+
-+void bfd_symbol_info (asymbol *symbol, symbol_info *ret);
-+
-+bfd_boolean bfd_copy_private_symbol_data
-+ (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
-+
-+#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
-+ BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
-+ (ibfd, isymbol, obfd, osymbol))
-+
-+/* Extracted from bfd.c. */
-+struct bfd
-+{
-+ /* A unique identifier of the BFD */
-+ unsigned int id;
-+
-+ /* The filename the application opened the BFD with. */
-+ const char *filename;
-+
-+ /* A pointer to the target jump table. */
-+ const struct bfd_target *xvec;
-+
-+ /* The IOSTREAM, and corresponding IO vector that provide access
-+ to the file backing the BFD. */
-+ void *iostream;
-+ const struct bfd_iovec *iovec;
-+
-+ /* Is the file descriptor being cached? That is, can it be closed as
-+ needed, and re-opened when accessed later? */
-+ bfd_boolean cacheable;
-+
-+ /* Marks whether there was a default target specified when the
-+ BFD was opened. This is used to select which matching algorithm
-+ to use to choose the back end. */
-+ bfd_boolean target_defaulted;
-+
-+ /* The caching routines use these to maintain a
-+ least-recently-used list of BFDs. */
-+ struct bfd *lru_prev, *lru_next;
-+
-+ /* When a file is closed by the caching routines, BFD retains
-+ state information on the file here... */
-+ ufile_ptr where;
-+
-+ /* ... and here: (``once'' means at least once). */
-+ bfd_boolean opened_once;
-+
-+ /* Set if we have a locally maintained mtime value, rather than
-+ getting it from the file each time. */
-+ bfd_boolean mtime_set;
-+
-+ /* File modified time, if mtime_set is TRUE. */
-+ long mtime;
-+
-+ /* Reserved for an unimplemented file locking extension. */
-+ int ifd;
-+
-+ /* The format which belongs to the BFD. (object, core, etc.) */
-+ bfd_format format;
-+
-+ /* The direction with which the BFD was opened. */
-+ enum bfd_direction
-+ {
-+ no_direction = 0,
-+ read_direction = 1,
-+ write_direction = 2,
-+ both_direction = 3
-+ }
-+ direction;
-+
-+ /* Format_specific flags. */
-+ flagword flags;
-+
-+ /* Currently my_archive is tested before adding origin to
-+ anything. I believe that this can become always an add of
-+ origin, with origin set to 0 for non archive files. */
-+ ufile_ptr origin;
-+
-+ /* Remember when output has begun, to stop strange things
-+ from happening. */
-+ bfd_boolean output_has_begun;
-+
-+ /* A hash table for section names. */
-+ struct bfd_hash_table section_htab;
-+
-+ /* Pointer to linked list of sections. */
-+ struct bfd_section *sections;
-+
-+ /* The last section on the section list. */
-+ struct bfd_section *section_last;
-+
-+ /* The number of sections. */
-+ unsigned int section_count;
-+
-+ /* Stuff only useful for object files:
-+ The start address. */
-+ bfd_vma start_address;
-+
-+ /* Used for input and output. */
-+ unsigned int symcount;
-+
-+ /* Symbol table for output BFD (with symcount entries). */
-+ struct bfd_symbol **outsymbols;
-+
-+ /* Used for slurped dynamic symbol tables. */
-+ unsigned int dynsymcount;
-+
-+ /* Pointer to structure which contains architecture information. */
-+ const struct bfd_arch_info *arch_info;
-+
-+ /* Flag set if symbols from this BFD should not be exported. */
-+ bfd_boolean no_export;
-+
-+ /* Stuff only useful for archives. */
-+ void *arelt_data;
-+ struct bfd *my_archive; /* The containing archive BFD. */
-+ struct bfd *archive_next; /* The next BFD in the archive. */
-+ struct bfd *archive_head; /* The first BFD in the archive. */
-+ bfd_boolean has_armap;
-+
-+ /* A chain of BFD structures involved in a link. */
-+ struct bfd *link_next;
-+
-+ /* A field used by _bfd_generic_link_add_archive_symbols. This will
-+ be used only for archive elements. */
-+ int archive_pass;
-+
-+ /* Used by the back end to hold private data. */
-+ union
-+ {
-+ struct aout_data_struct *aout_data;
-+ struct artdata *aout_ar_data;
-+ struct _oasys_data *oasys_obj_data;
-+ struct _oasys_ar_data *oasys_ar_data;
-+ struct coff_tdata *coff_obj_data;
-+ struct pe_tdata *pe_obj_data;
-+ struct xcoff_tdata *xcoff_obj_data;
-+ struct ecoff_tdata *ecoff_obj_data;
-+ struct ieee_data_struct *ieee_data;
-+ struct ieee_ar_data_struct *ieee_ar_data;
-+ struct srec_data_struct *srec_data;
-+ struct ihex_data_struct *ihex_data;
-+ struct tekhex_data_struct *tekhex_data;
-+ struct elf_obj_tdata *elf_obj_data;
-+ struct nlm_obj_tdata *nlm_obj_data;
-+ struct bout_data_struct *bout_data;
-+ struct mmo_data_struct *mmo_data;
-+ struct sun_core_struct *sun_core_data;
-+ struct sco5_core_struct *sco5_core_data;
-+ struct trad_core_struct *trad_core_data;
-+ struct som_data_struct *som_data;
-+ struct hpux_core_struct *hpux_core_data;
-+ struct hppabsd_core_struct *hppabsd_core_data;
-+ struct sgi_core_struct *sgi_core_data;
-+ struct lynx_core_struct *lynx_core_data;
-+ struct osf_core_struct *osf_core_data;
-+ struct cisco_core_struct *cisco_core_data;
-+ struct versados_data_struct *versados_data;
-+ struct netbsd_core_struct *netbsd_core_data;
-+ struct mach_o_data_struct *mach_o_data;
-+ struct mach_o_fat_data_struct *mach_o_fat_data;
-+ struct bfd_pef_data_struct *pef_data;
-+ struct bfd_pef_xlib_data_struct *pef_xlib_data;
-+ struct bfd_sym_data_struct *sym_data;
-+ void *any;
-+ }
-+ tdata;
-+
-+ /* Used by the application to hold private data. */
-+ void *usrdata;
-+
-+ /* Where all the allocated stuff under this BFD goes. This is a
-+ struct objalloc *, but we use void * to avoid requiring the inclusion
-+ of objalloc.h. */
-+ void *memory;
-+};
-+
-+typedef enum bfd_error
-+{
-+ bfd_error_no_error = 0,
-+ bfd_error_system_call,
-+ bfd_error_invalid_target,
-+ bfd_error_wrong_format,
-+ bfd_error_wrong_object_format,
-+ bfd_error_invalid_operation,
-+ bfd_error_no_memory,
-+ bfd_error_no_symbols,
-+ bfd_error_no_armap,
-+ bfd_error_no_more_archived_files,
-+ bfd_error_malformed_archive,
-+ bfd_error_file_not_recognized,
-+ bfd_error_file_ambiguously_recognized,
-+ bfd_error_no_contents,
-+ bfd_error_nonrepresentable_section,
-+ bfd_error_no_debug_section,
-+ bfd_error_bad_value,
-+ bfd_error_file_truncated,
-+ bfd_error_file_too_big,
-+ bfd_error_on_input,
-+ bfd_error_invalid_error_code
-+}
-+bfd_error_type;
-+
-+bfd_error_type bfd_get_error (void);
-+
-+void bfd_set_error (bfd_error_type error_tag, ...);
-+
-+const char *bfd_errmsg (bfd_error_type error_tag);
-+
-+void bfd_perror (const char *message);
-+
-+typedef void (*bfd_error_handler_type) (const char *, ...);
-+
-+bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
-+
-+void bfd_set_error_program_name (const char *);
-+
-+bfd_error_handler_type bfd_get_error_handler (void);
-+
-+long bfd_get_reloc_upper_bound (bfd *abfd, asection *sect);
-+
-+long bfd_canonicalize_reloc
-+ (bfd *abfd, asection *sec, arelent **loc, asymbol **syms);
-+
-+void bfd_set_reloc
-+ (bfd *abfd, asection *sec, arelent **rel, unsigned int count);
-+
-+bfd_boolean bfd_set_file_flags (bfd *abfd, flagword flags);
-+
-+int bfd_get_arch_size (bfd *abfd);
-+
-+int bfd_get_sign_extend_vma (bfd *abfd);
-+
-+bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma);
-+
-+unsigned int bfd_get_gp_size (bfd *abfd);
-+
-+void bfd_set_gp_size (bfd *abfd, unsigned int i);
-+
-+bfd_vma bfd_scan_vma (const char *string, const char **end, int base);
-+
-+bfd_boolean bfd_copy_private_header_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_copy_private_header_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_copy_private_header_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_copy_private_bfd_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_merge_private_bfd_data (bfd *ibfd, bfd *obfd);
-+
-+#define bfd_merge_private_bfd_data(ibfd, obfd) \
-+ BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
-+ (ibfd, obfd))
-+bfd_boolean bfd_set_private_flags (bfd *abfd, flagword flags);
-+
-+#define bfd_set_private_flags(abfd, flags) \
-+ BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags))
-+#define bfd_sizeof_headers(abfd, info) \
-+ BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info))
-+
-+#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
-+ BFD_SEND (abfd, _bfd_find_nearest_line, \
-+ (abfd, sec, syms, off, file, func, line))
-+
-+#define bfd_find_line(abfd, syms, sym, file, line) \
-+ BFD_SEND (abfd, _bfd_find_line, \
-+ (abfd, syms, sym, file, line))
-+
-+#define bfd_find_inliner_info(abfd, file, func, line) \
-+ BFD_SEND (abfd, _bfd_find_inliner_info, \
-+ (abfd, file, func, line))
-+
-+#define bfd_debug_info_start(abfd) \
-+ BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
-+
-+#define bfd_debug_info_end(abfd) \
-+ BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
-+
-+#define bfd_debug_info_accumulate(abfd, section) \
-+ BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
-+
-+#define bfd_stat_arch_elt(abfd, stat) \
-+ BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
-+
-+#define bfd_update_armap_timestamp(abfd) \
-+ BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
-+
-+#define bfd_set_arch_mach(abfd, arch, mach)\
-+ BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
-+
-+#define bfd_relax_section(abfd, section, link_info, again) \
-+ BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
-+
-+#define bfd_gc_sections(abfd, link_info) \
-+ BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
-+
-+#define bfd_merge_sections(abfd, link_info) \
-+ BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
-+
-+#define bfd_is_group_section(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
-+
-+#define bfd_discard_group(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
-+
-+#define bfd_link_hash_table_create(abfd) \
-+ BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
-+
-+#define bfd_link_hash_table_free(abfd, hash) \
-+ BFD_SEND (abfd, _bfd_link_hash_table_free, (hash))
-+
-+#define bfd_link_add_symbols(abfd, info) \
-+ BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
-+
-+#define bfd_link_just_syms(abfd, sec, info) \
-+ BFD_SEND (abfd, _bfd_link_just_syms, (sec, info))
-+
-+#define bfd_final_link(abfd, info) \
-+ BFD_SEND (abfd, _bfd_final_link, (abfd, info))
-+
-+#define bfd_free_cached_info(abfd) \
-+ BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
-+
-+#define bfd_get_dynamic_symtab_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
-+
-+#define bfd_print_private_bfd_data(abfd, file)\
-+ BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
-+
-+#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
-+ BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
-+
-+#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
-+ BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
-+ dyncount, dynsyms, ret))
-+
-+#define bfd_get_dynamic_reloc_upper_bound(abfd) \
-+ BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
-+
-+#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
-+ BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
-+
-+extern bfd_byte *bfd_get_relocated_section_contents
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *,
-+ bfd_boolean, asymbol **);
-+
-+bfd_boolean bfd_alt_mach_code (bfd *abfd, int alternative);
-+
-+struct bfd_preserve
-+{
-+ void *marker;
-+ void *tdata;
-+ flagword flags;
-+ const struct bfd_arch_info *arch_info;
-+ struct bfd_section *sections;
-+ struct bfd_section *section_last;
-+ unsigned int section_count;
-+ struct bfd_hash_table section_htab;
-+};
-+
-+bfd_boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
-+
-+void bfd_preserve_restore (bfd *, struct bfd_preserve *);
-+
-+void bfd_preserve_finish (bfd *, struct bfd_preserve *);
-+
-+bfd_vma bfd_emul_get_maxpagesize (const char *);
-+
-+void bfd_emul_set_maxpagesize (const char *, bfd_vma);
-+
-+bfd_vma bfd_emul_get_commonpagesize (const char *);
-+
-+void bfd_emul_set_commonpagesize (const char *, bfd_vma);
-+
-+char *bfd_demangle (bfd *, const char *, int);
-+
-+/* Extracted from archive.c. */
-+symindex bfd_get_next_mapent
-+ (bfd *abfd, symindex previous, carsym **sym);
-+
-+bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head);
-+
-+bfd *bfd_openr_next_archived_file (bfd *archive, bfd *previous);
-+
-+/* Extracted from corefile.c. */
-+const char *bfd_core_file_failing_command (bfd *abfd);
-+
-+int bfd_core_file_failing_signal (bfd *abfd);
-+
-+bfd_boolean core_file_matches_executable_p
-+ (bfd *core_bfd, bfd *exec_bfd);
-+
-+bfd_boolean generic_core_file_matches_executable_p
-+ (bfd *core_bfd, bfd *exec_bfd);
-+
-+/* Extracted from targets.c. */
-+#define BFD_SEND(bfd, message, arglist) \
-+ ((*((bfd)->xvec->message)) arglist)
-+
-+#ifdef DEBUG_BFD_SEND
-+#undef BFD_SEND
-+#define BFD_SEND(bfd, message, arglist) \
-+ (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-+ ((*((bfd)->xvec->message)) arglist) : \
-+ (bfd_assert (__FILE__,__LINE__), NULL))
-+#endif
-+#define BFD_SEND_FMT(bfd, message, arglist) \
-+ (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist)
-+
-+#ifdef DEBUG_BFD_SEND
-+#undef BFD_SEND_FMT
-+#define BFD_SEND_FMT(bfd, message, arglist) \
-+ (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-+ (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \
-+ (bfd_assert (__FILE__,__LINE__), NULL))
-+#endif
-+
-+enum bfd_flavour
-+{
-+ bfd_target_unknown_flavour,
-+ bfd_target_aout_flavour,
-+ bfd_target_coff_flavour,
-+ bfd_target_ecoff_flavour,
-+ bfd_target_xcoff_flavour,
-+ bfd_target_elf_flavour,
-+ bfd_target_ieee_flavour,
-+ bfd_target_nlm_flavour,
-+ bfd_target_oasys_flavour,
-+ bfd_target_tekhex_flavour,
-+ bfd_target_srec_flavour,
-+ bfd_target_ihex_flavour,
-+ bfd_target_som_flavour,
-+ bfd_target_os9k_flavour,
-+ bfd_target_versados_flavour,
-+ bfd_target_msdos_flavour,
-+ bfd_target_ovax_flavour,
-+ bfd_target_evax_flavour,
-+ bfd_target_mmo_flavour,
-+ bfd_target_mach_o_flavour,
-+ bfd_target_pef_flavour,
-+ bfd_target_pef_xlib_flavour,
-+ bfd_target_sym_flavour
-+};
-+
-+enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
-+
-+/* Forward declaration. */
-+typedef struct bfd_link_info _bfd_link_info;
-+
-+typedef struct bfd_target
-+{
-+ /* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. */
-+ char *name;
-+
-+ /* The "flavour" of a back end is a general indication about
-+ the contents of a file. */
-+ enum bfd_flavour flavour;
-+
-+ /* The order of bytes within the data area of a file. */
-+ enum bfd_endian byteorder;
-+
-+ /* The order of bytes within the header parts of a file. */
-+ enum bfd_endian header_byteorder;
-+
-+ /* A mask of all the flags which an executable may have set -
-+ from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>. */
-+ flagword object_flags;
-+
-+ /* A mask of all the flags which a section may have set - from
-+ the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>. */
-+ flagword section_flags;
-+
-+ /* The character normally found at the front of a symbol.
-+ (if any), perhaps `_'. */
-+ char symbol_leading_char;
-+
-+ /* The pad character for file names within an archive header. */
-+ char ar_pad_char;
-+
-+ /* The maximum number of characters in an archive header. */
-+ unsigned short ar_max_namelen;
-+
-+ /* Entries for byte swapping for data. These are different from the
-+ other entry points, since they don't take a BFD as the first argument.
-+ Certain other handlers could do the same. */
-+ bfd_uint64_t (*bfd_getx64) (const void *);
-+ bfd_int64_t (*bfd_getx_signed_64) (const void *);
-+ void (*bfd_putx64) (bfd_uint64_t, void *);
-+ bfd_vma (*bfd_getx32) (const void *);
-+ bfd_signed_vma (*bfd_getx_signed_32) (const void *);
-+ void (*bfd_putx32) (bfd_vma, void *);
-+ bfd_vma (*bfd_getx16) (const void *);
-+ bfd_signed_vma (*bfd_getx_signed_16) (const void *);
-+ void (*bfd_putx16) (bfd_vma, void *);
-+
-+ /* Byte swapping for the headers. */
-+ bfd_uint64_t (*bfd_h_getx64) (const void *);
-+ bfd_int64_t (*bfd_h_getx_signed_64) (const void *);
-+ void (*bfd_h_putx64) (bfd_uint64_t, void *);
-+ bfd_vma (*bfd_h_getx32) (const void *);
-+ bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
-+ void (*bfd_h_putx32) (bfd_vma, void *);
-+ bfd_vma (*bfd_h_getx16) (const void *);
-+ bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
-+ void (*bfd_h_putx16) (bfd_vma, void *);
-+
-+ /* Format dependent routines: these are vectors of entry points
-+ within the target vector structure, one for each format to check. */
-+
-+ /* Check the format of a file being read. Return a <<bfd_target *>> or zero. */
-+ const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
-+
-+ /* Set the format of a file being written. */
-+ bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
-+
-+ /* Write cached information into a file being written, at <<bfd_close>>. */
-+ bfd_boolean (*_bfd_write_contents[bfd_type_end]) (bfd *);
-+
-+
-+ /* Generic entry points. */
-+#define BFD_JUMP_TABLE_GENERIC(NAME) \
-+ NAME##_close_and_cleanup, \
-+ NAME##_bfd_free_cached_info, \
-+ NAME##_new_section_hook, \
-+ NAME##_get_section_contents, \
-+ NAME##_get_section_contents_in_window
-+
-+ /* Called when the BFD is being closed to do any necessary cleanup. */
-+ bfd_boolean (*_close_and_cleanup) (bfd *);
-+ /* Ask the BFD to free all cached information. */
-+ bfd_boolean (*_bfd_free_cached_info) (bfd *);
-+ /* Called when a new section is created. */
-+ bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
-+ /* Read the contents of a section. */
-+ bfd_boolean (*_bfd_get_section_contents)
-+ (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
-+ bfd_boolean (*_bfd_get_section_contents_in_window)
-+ (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);
-+
-+ /* Entry points to copy private data. */
-+#define BFD_JUMP_TABLE_COPY(NAME) \
-+ NAME##_bfd_copy_private_bfd_data, \
-+ NAME##_bfd_merge_private_bfd_data, \
-+ _bfd_generic_init_private_section_data, \
-+ NAME##_bfd_copy_private_section_data, \
-+ NAME##_bfd_copy_private_symbol_data, \
-+ NAME##_bfd_copy_private_header_data, \
-+ NAME##_bfd_set_private_flags, \
-+ NAME##_bfd_print_private_bfd_data
-+
-+ /* Called to copy BFD general private data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
-+ /* Called to merge BFD general private data from one object file
-+ to a common output file when linking. */
-+ bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *);
-+ /* Called to initialize BFD private section data from one object file
-+ to another. */
-+#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \
-+ BFD_SEND (obfd, _bfd_init_private_section_data, (ibfd, isec, obfd, osec, link_info))
-+ bfd_boolean (*_bfd_init_private_section_data)
-+ (bfd *, sec_ptr, bfd *, sec_ptr, struct bfd_link_info *);
-+ /* Called to copy BFD private section data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_section_data)
-+ (bfd *, sec_ptr, bfd *, sec_ptr);
-+ /* Called to copy BFD private symbol data from one symbol
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_symbol_data)
-+ (bfd *, asymbol *, bfd *, asymbol *);
-+ /* Called to copy BFD private header data from one object file
-+ to another. */
-+ bfd_boolean (*_bfd_copy_private_header_data)
-+ (bfd *, bfd *);
-+ /* Called to set private backend flags. */
-+ bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
-+
-+ /* Called to print private BFD data. */
-+ bfd_boolean (*_bfd_print_private_bfd_data) (bfd *, void *);
-+
-+ /* Core file entry points. */
-+#define BFD_JUMP_TABLE_CORE(NAME) \
-+ NAME##_core_file_failing_command, \
-+ NAME##_core_file_failing_signal, \
-+ NAME##_core_file_matches_executable_p
-+
-+ char * (*_core_file_failing_command) (bfd *);
-+ int (*_core_file_failing_signal) (bfd *);
-+ bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);
-+
-+ /* Archive entry points. */
-+#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
-+ NAME##_slurp_armap, \
-+ NAME##_slurp_extended_name_table, \
-+ NAME##_construct_extended_name_table, \
-+ NAME##_truncate_arname, \
-+ NAME##_write_armap, \
-+ NAME##_read_ar_hdr, \
-+ NAME##_openr_next_archived_file, \
-+ NAME##_get_elt_at_index, \
-+ NAME##_generic_stat_arch_elt, \
-+ NAME##_update_armap_timestamp
-+
-+ bfd_boolean (*_bfd_slurp_armap) (bfd *);
-+ bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
-+ bfd_boolean (*_bfd_construct_extended_name_table)
-+ (bfd *, char **, bfd_size_type *, const char **);
-+ void (*_bfd_truncate_arname) (bfd *, const char *, char *);
-+ bfd_boolean (*write_armap)
-+ (bfd *, unsigned int, struct orl *, unsigned int, int);
-+ void * (*_bfd_read_ar_hdr_fn) (bfd *);
-+ bfd * (*openr_next_archived_file) (bfd *, bfd *);
-+#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
-+ bfd * (*_bfd_get_elt_at_index) (bfd *, symindex);
-+ int (*_bfd_stat_arch_elt) (bfd *, struct stat *);
-+ bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
-+
-+ /* Entry points used for symbols. */
-+#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
-+ NAME##_get_symtab_upper_bound, \
-+ NAME##_canonicalize_symtab, \
-+ NAME##_make_empty_symbol, \
-+ NAME##_print_symbol, \
-+ NAME##_get_symbol_info, \
-+ NAME##_bfd_is_local_label_name, \
-+ NAME##_bfd_is_target_special_symbol, \
-+ NAME##_get_lineno, \
-+ NAME##_find_nearest_line, \
-+ _bfd_generic_find_line, \
-+ NAME##_find_inliner_info, \
-+ NAME##_bfd_make_debug_symbol, \
-+ NAME##_read_minisymbols, \
-+ NAME##_minisymbol_to_symbol
-+
-+ long (*_bfd_get_symtab_upper_bound) (bfd *);
-+ long (*_bfd_canonicalize_symtab)
-+ (bfd *, struct bfd_symbol **);
-+ struct bfd_symbol *
-+ (*_bfd_make_empty_symbol) (bfd *);
-+ void (*_bfd_print_symbol)
-+ (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
-+#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
-+ void (*_bfd_get_symbol_info)
-+ (bfd *, struct bfd_symbol *, symbol_info *);
-+#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
-+ bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
-+ bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
-+ alent * (*_get_lineno) (bfd *, struct bfd_symbol *);
-+ bfd_boolean (*_bfd_find_nearest_line)
-+ (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
-+ const char **, const char **, unsigned int *);
-+ bfd_boolean (*_bfd_find_line)
-+ (bfd *, struct bfd_symbol **, struct bfd_symbol *,
-+ const char **, unsigned int *);
-+ bfd_boolean (*_bfd_find_inliner_info)
-+ (bfd *, const char **, const char **, unsigned int *);
-+ /* Back-door to allow format-aware applications to create debug symbols
-+ while using BFD for everything else. Currently used by the assembler
-+ when creating COFF files. */
-+ asymbol * (*_bfd_make_debug_symbol)
-+ (bfd *, void *, unsigned long size);
-+#define bfd_read_minisymbols(b, d, m, s) \
-+ BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-+ long (*_read_minisymbols)
-+ (bfd *, bfd_boolean, void **, unsigned int *);
-+#define bfd_minisymbol_to_symbol(b, d, m, f) \
-+ BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-+ asymbol * (*_minisymbol_to_symbol)
-+ (bfd *, bfd_boolean, const void *, asymbol *);
-+
-+ /* Routines for relocs. */
-+#define BFD_JUMP_TABLE_RELOCS(NAME) \
-+ NAME##_get_reloc_upper_bound, \
-+ NAME##_canonicalize_reloc, \
-+ NAME##_bfd_reloc_type_lookup, \
-+ NAME##_bfd_reloc_name_lookup
-+
-+ long (*_get_reloc_upper_bound) (bfd *, sec_ptr);
-+ long (*_bfd_canonicalize_reloc)
-+ (bfd *, sec_ptr, arelent **, struct bfd_symbol **);
-+ /* See documentation on reloc types. */
-+ reloc_howto_type *
-+ (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
-+ reloc_howto_type *
-+ (*reloc_name_lookup) (bfd *, const char *);
-+
-+
-+ /* Routines used when writing an object file. */
-+#define BFD_JUMP_TABLE_WRITE(NAME) \
-+ NAME##_set_arch_mach, \
-+ NAME##_set_section_contents
-+
-+ bfd_boolean (*_bfd_set_arch_mach)
-+ (bfd *, enum bfd_architecture, unsigned long);
-+ bfd_boolean (*_bfd_set_section_contents)
-+ (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
-+
-+ /* Routines used by the linker. */
-+#define BFD_JUMP_TABLE_LINK(NAME) \
-+ NAME##_sizeof_headers, \
-+ NAME##_bfd_get_relocated_section_contents, \
-+ NAME##_bfd_relax_section, \
-+ NAME##_bfd_link_hash_table_create, \
-+ NAME##_bfd_link_hash_table_free, \
-+ NAME##_bfd_link_add_symbols, \
-+ NAME##_bfd_link_just_syms, \
-+ NAME##_bfd_final_link, \
-+ NAME##_bfd_link_split_section, \
-+ NAME##_bfd_gc_sections, \
-+ NAME##_bfd_merge_sections, \
-+ NAME##_bfd_is_group_section, \
-+ NAME##_bfd_discard_group, \
-+ NAME##_section_already_linked \
-+
-+ int (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
-+ bfd_byte * (*_bfd_get_relocated_section_contents)
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *,
-+ bfd_byte *, bfd_boolean, struct bfd_symbol **);
-+
-+ bfd_boolean (*_bfd_relax_section)
-+ (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
-+
-+ /* Create a hash table for the linker. Different backends store
-+ different information in this table. */
-+ struct bfd_link_hash_table *
-+ (*_bfd_link_hash_table_create) (bfd *);
-+
-+ /* Release the memory associated with the linker hash table. */
-+ void (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *);
-+
-+ /* Add symbols from this object file into the hash table. */
-+ bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
-+
-+ /* Indicate that we are only retrieving symbol values from this section. */
-+ void (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);
-+
-+ /* Do a link based on the link_order structures attached to each
-+ section of the BFD. */
-+ bfd_boolean (*_bfd_final_link) (bfd *, struct bfd_link_info *);
-+
-+ /* Should this section be split up into smaller pieces during linking. */
-+ bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
-+
-+ /* Remove sections that are not referenced from the output. */
-+ bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
-+
-+ /* Attempt to merge SEC_MERGE sections. */
-+ bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
-+
-+ /* Is this section a member of a group? */
-+ bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
-+
-+ /* Discard members of a group. */
-+ bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
-+
-+ /* Check if SEC has been already linked during a reloceatable or
-+ final link. */
-+ void (*_section_already_linked) (bfd *, struct bfd_section *,
-+ struct bfd_link_info *);
-+
-+ /* Routines to handle dynamic symbols and relocs. */
-+#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
-+ NAME##_get_dynamic_symtab_upper_bound, \
-+ NAME##_canonicalize_dynamic_symtab, \
-+ NAME##_get_synthetic_symtab, \
-+ NAME##_get_dynamic_reloc_upper_bound, \
-+ NAME##_canonicalize_dynamic_reloc
-+
-+ /* Get the amount of memory required to hold the dynamic symbols. */
-+ long (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);
-+ /* Read in the dynamic symbols. */
-+ long (*_bfd_canonicalize_dynamic_symtab)
-+ (bfd *, struct bfd_symbol **);
-+ /* Create synthetized symbols. */
-+ long (*_bfd_get_synthetic_symtab)
-+ (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
-+ struct bfd_symbol **);
-+ /* Get the amount of memory required to hold the dynamic relocs. */
-+ long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
-+ /* Read in the dynamic relocs. */
-+ long (*_bfd_canonicalize_dynamic_reloc)
-+ (bfd *, arelent **, struct bfd_symbol **);
-+
-+ /* Opposite endian version of this target. */
-+ const struct bfd_target * alternative_target;
-+
-+ /* Data for use by back-end routines, which isn't
-+ generic enough to belong in this structure. */
-+ const void *backend_data;
-+
-+} bfd_target;
-+
-+bfd_boolean bfd_set_default_target (const char *name);
-+
-+const bfd_target *bfd_find_target (const char *target_name, bfd *abfd);
-+
-+const char ** bfd_target_list (void);
-+
-+const bfd_target *bfd_search_for_target
-+ (int (*search_func) (const bfd_target *, void *),
-+ void *);
-+
-+/* Extracted from format.c. */
-+bfd_boolean bfd_check_format (bfd *abfd, bfd_format format);
-+
-+bfd_boolean bfd_check_format_matches
-+ (bfd *abfd, bfd_format format, char ***matching);
-+
-+bfd_boolean bfd_set_format (bfd *abfd, bfd_format format);
-+
-+const char *bfd_format_string (bfd_format format);
-+
-+/* Extracted from linker.c. */
-+bfd_boolean bfd_link_split_section (bfd *abfd, asection *sec);
-+
-+#define bfd_link_split_section(abfd, sec) \
-+ BFD_SEND (abfd, _bfd_link_split_section, (abfd, sec))
-+
-+void bfd_section_already_linked (bfd *abfd, asection *sec,
-+ struct bfd_link_info *info);
-+
-+#define bfd_section_already_linked(abfd, sec, info) \
-+ BFD_SEND (abfd, _section_already_linked, (abfd, sec, info))
-+
-+/* Extracted from simple.c. */
-+bfd_byte *bfd_simple_get_relocated_section_contents
-+ (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
---- /dev/null
-+++ b/bfd/doc/libbfd.h
-@@ -0,0 +1,2074 @@
-+/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
-+ generated from "libbfd-in.h", "init.c", "libbfd.c", "bfdio.c",
-+ "bfdwin.c", "cache.c", "reloc.c", "archures.c" and "elf.c".
-+ Run "make headers" in your build bfd/ to regenerate. */
-+
-+/* libbfd.h -- Declarations used by bfd library *implementation*.
-+ (This include file is not for users of the library.)
-+
-+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+ Free Software Foundation, Inc.
-+
-+ Written by Cygnus Support.
-+
-+ 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 3 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. */
-+
-+#include "hashtab.h"
-+
-+/* Align an address upward to a boundary, expressed as a number of bytes.
-+ E.g. align to an 8-byte boundary with argument of 8. Take care never
-+ to wrap around if the address is within boundary-1 of the end of the
-+ address space. */
-+#define BFD_ALIGN(this, boundary) \
-+ ((((bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this)) \
-+ ? (((bfd_vma) (this) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary)-1)) \
-+ : ~ (bfd_vma) 0)
-+
-+/* If you want to read and write large blocks, you might want to do it
-+ in quanta of this amount */
-+#define DEFAULT_BUFFERSIZE 8192
-+
-+/* Set a tdata field. Can't use the other macros for this, since they
-+ do casts, and casting to the left of assignment isn't portable. */
-+#define set_tdata(bfd, v) ((bfd)->tdata.any = (v))
-+
-+/* If BFD_IN_MEMORY is set for a BFD, then the iostream fields points
-+ to an instance of this structure. */
-+
-+struct bfd_in_memory
-+{
-+ /* Size of buffer. */
-+ bfd_size_type size;
-+ /* Buffer holding contents of BFD. */
-+ bfd_byte *buffer;
-+};
-+
-+struct section_hash_entry
-+{
-+ struct bfd_hash_entry root;
-+ asection section;
-+};
-+
-+/* tdata for an archive. For an input archive, cache
-+ needs to be free()'d. For an output archive, symdefs do. */
-+
-+struct artdata {
-+ file_ptr first_file_filepos;
-+ /* Speed up searching the armap */
-+ htab_t cache;
-+ bfd *archive_head; /* Only interesting in output routines */
-+ carsym *symdefs; /* the symdef entries */
-+ symindex symdef_count; /* how many there are */
-+ char *extended_names; /* clever intel extension */
-+ bfd_size_type extended_names_size; /* Size of extended names */
-+ /* when more compilers are standard C, this can be a time_t */
-+ long armap_timestamp; /* Timestamp value written into armap.
-+ This is used for BSD archives to check
-+ that the timestamp is recent enough
-+ for the BSD linker to not complain,
-+ just before we finish writing an
-+ archive. */
-+ file_ptr armap_datepos; /* Position within archive to seek to
-+ rewrite the date field. */
-+ void *tdata; /* Backend specific information. */
-+};
-+
-+#define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
-+
-+/* Goes in bfd's arelt_data slot */
-+struct areltdata {
-+ char * arch_header; /* it's actually a string */
-+ unsigned int parsed_size; /* octets of filesize not including ar_hdr */
-+ char *filename; /* null-terminated */
-+};
-+
-+#define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
-+
-+extern void *bfd_malloc
-+ (bfd_size_type);
-+extern void *bfd_realloc
-+ (void *, bfd_size_type);
-+extern void *bfd_zmalloc
-+ (bfd_size_type);
-+extern void *bfd_malloc2
-+ (bfd_size_type, bfd_size_type);
-+extern void *bfd_realloc2
-+ (void *, bfd_size_type, bfd_size_type);
-+extern void *bfd_zmalloc2
-+ (bfd_size_type, bfd_size_type);
-+
-+extern void _bfd_default_error_handler (const char *s, ...);
-+extern bfd_error_handler_type _bfd_error_handler;
-+
-+/* These routines allocate and free things on the BFD's objalloc. */
-+
-+extern void *bfd_alloc
-+ (bfd *, bfd_size_type);
-+extern void *bfd_zalloc
-+ (bfd *, bfd_size_type);
-+extern void *bfd_alloc2
-+ (bfd *, bfd_size_type, bfd_size_type);
-+extern void *bfd_zalloc2
-+ (bfd *, bfd_size_type, bfd_size_type);
-+extern void bfd_release
-+ (bfd *, void *);
-+
-+bfd * _bfd_create_empty_archive_element_shell
-+ (bfd *obfd);
-+bfd * _bfd_look_for_bfd_in_cache
-+ (bfd *, file_ptr);
-+bfd_boolean _bfd_add_bfd_to_archive_cache
-+ (bfd *, file_ptr, bfd *);
-+bfd_boolean _bfd_generic_mkarchive
-+ (bfd *abfd);
-+const bfd_target *bfd_generic_archive_p
-+ (bfd *abfd);
-+bfd_boolean bfd_slurp_armap
-+ (bfd *abfd);
-+bfd_boolean bfd_slurp_bsd_armap_f2
-+ (bfd *abfd);
-+#define bfd_slurp_bsd_armap bfd_slurp_armap
-+#define bfd_slurp_coff_armap bfd_slurp_armap
-+bfd_boolean _bfd_slurp_extended_name_table
-+ (bfd *abfd);
-+extern bfd_boolean _bfd_construct_extended_name_table
-+ (bfd *, bfd_boolean, char **, bfd_size_type *);
-+bfd_boolean _bfd_write_archive_contents
-+ (bfd *abfd);
-+bfd_boolean _bfd_compute_and_write_armap
-+ (bfd *, unsigned int elength);
-+bfd *_bfd_get_elt_at_filepos
-+ (bfd *archive, file_ptr filepos);
-+extern bfd *_bfd_generic_get_elt_at_index
-+ (bfd *, symindex);
-+bfd * _bfd_new_bfd
-+ (void);
-+void _bfd_delete_bfd
-+ (bfd *);
-+bfd_boolean _bfd_free_cached_info
-+ (bfd *);
-+
-+bfd_boolean bfd_false
-+ (bfd *ignore);
-+bfd_boolean bfd_true
-+ (bfd *ignore);
-+void *bfd_nullvoidptr
-+ (bfd *ignore);
-+int bfd_0
-+ (bfd *ignore);
-+unsigned int bfd_0u
-+ (bfd *ignore);
-+long bfd_0l
-+ (bfd *ignore);
-+long _bfd_n1
-+ (bfd *ignore);
-+void bfd_void
-+ (bfd *ignore);
-+
-+bfd *_bfd_new_bfd_contained_in
-+ (bfd *);
-+const bfd_target *_bfd_dummy_target
-+ (bfd *abfd);
-+
-+void bfd_dont_truncate_arname
-+ (bfd *abfd, const char *filename, char *hdr);
-+void bfd_bsd_truncate_arname
-+ (bfd *abfd, const char *filename, char *hdr);
-+void bfd_gnu_truncate_arname
-+ (bfd *abfd, const char *filename, char *hdr);
-+
-+bfd_boolean bsd_write_armap
-+ (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
-+ int stridx);
-+
-+bfd_boolean coff_write_armap
-+ (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
-+ int stridx);
-+
-+extern void *_bfd_generic_read_ar_hdr
-+ (bfd *);
-+extern void _bfd_ar_spacepad
-+ (char *, size_t, const char *, long);
-+
-+extern void *_bfd_generic_read_ar_hdr_mag
-+ (bfd *, const char *);
-+
-+bfd * bfd_generic_openr_next_archived_file
-+ (bfd *archive, bfd *last_file);
-+
-+int bfd_generic_stat_arch_elt
-+ (bfd *, struct stat *);
-+
-+#define _bfd_read_ar_hdr(abfd) \
-+ BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
-+
-+/* Generic routines to use for BFD_JUMP_TABLE_GENERIC. Use
-+ BFD_JUMP_TABLE_GENERIC (_bfd_generic). */
-+
-+#define _bfd_generic_close_and_cleanup bfd_true
-+#define _bfd_generic_bfd_free_cached_info bfd_true
-+extern bfd_boolean _bfd_generic_new_section_hook
-+ (bfd *, asection *);
-+extern bfd_boolean _bfd_generic_get_section_contents
-+ (bfd *, asection *, void *, file_ptr, bfd_size_type);
-+extern bfd_boolean _bfd_generic_get_section_contents_in_window
-+ (bfd *, asection *, bfd_window *, file_ptr, bfd_size_type);
-+
-+/* Generic routines to use for BFD_JUMP_TABLE_COPY. Use
-+ BFD_JUMP_TABLE_COPY (_bfd_generic). */
-+
-+#define _bfd_generic_bfd_copy_private_bfd_data \
-+ ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
-+#define _bfd_generic_bfd_merge_private_bfd_data \
-+ ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
-+#define _bfd_generic_bfd_set_private_flags \
-+ ((bfd_boolean (*) (bfd *, flagword)) bfd_true)
-+#define _bfd_generic_bfd_copy_private_section_data \
-+ ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true)
-+#define _bfd_generic_bfd_copy_private_symbol_data \
-+ ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true)
-+#define _bfd_generic_bfd_copy_private_header_data \
-+ ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
-+#define _bfd_generic_bfd_print_private_bfd_data \
-+ ((bfd_boolean (*) (bfd *, void *)) bfd_true)
-+
-+extern bfd_boolean _bfd_generic_init_private_section_data
-+ (bfd *, asection *, bfd *, asection *, struct bfd_link_info *);
-+
-+/* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
-+ support. Use BFD_JUMP_TABLE_CORE (_bfd_nocore). */
-+
-+extern char *_bfd_nocore_core_file_failing_command
-+ (bfd *);
-+extern int _bfd_nocore_core_file_failing_signal
-+ (bfd *);
-+extern bfd_boolean _bfd_nocore_core_file_matches_executable_p
-+ (bfd *, bfd *);
-+
-+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
-+ file support. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive). */
-+
-+#define _bfd_noarchive_slurp_armap bfd_false
-+#define _bfd_noarchive_slurp_extended_name_table bfd_false
-+#define _bfd_noarchive_construct_extended_name_table \
-+ ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) \
-+ bfd_false)
-+#define _bfd_noarchive_truncate_arname \
-+ ((void (*) (bfd *, const char *, char *)) bfd_void)
-+#define _bfd_noarchive_write_armap \
-+ ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) \
-+ bfd_false)
-+#define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
-+#define _bfd_noarchive_openr_next_archived_file \
-+ ((bfd *(*) (bfd *, bfd *)) bfd_nullvoidptr)
-+#define _bfd_noarchive_get_elt_at_index \
-+ ((bfd *(*) (bfd *, symindex)) bfd_nullvoidptr)
-+#define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt
-+#define _bfd_noarchive_update_armap_timestamp bfd_false
-+
-+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD style
-+ archives. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd). */
-+
-+#define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
-+#define _bfd_archive_bsd_slurp_extended_name_table \
-+ _bfd_slurp_extended_name_table
-+extern bfd_boolean _bfd_archive_bsd_construct_extended_name_table
-+ (bfd *, char **, bfd_size_type *, const char **);
-+#define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
-+#define _bfd_archive_bsd_write_armap bsd_write_armap
-+#define _bfd_archive_bsd_read_ar_hdr _bfd_generic_read_ar_hdr
-+#define _bfd_archive_bsd_openr_next_archived_file \
-+ bfd_generic_openr_next_archived_file
-+#define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
-+#define _bfd_archive_bsd_generic_stat_arch_elt \
-+ bfd_generic_stat_arch_elt
-+extern bfd_boolean _bfd_archive_bsd_update_armap_timestamp
-+ (bfd *);
-+
-+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
-+ archives. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff). */
-+
-+#define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
-+#define _bfd_archive_coff_slurp_extended_name_table \
-+ _bfd_slurp_extended_name_table
-+extern bfd_boolean _bfd_archive_coff_construct_extended_name_table
-+ (bfd *, char **, bfd_size_type *, const char **);
-+#define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
-+#define _bfd_archive_coff_write_armap coff_write_armap
-+#define _bfd_archive_coff_read_ar_hdr _bfd_generic_read_ar_hdr
-+#define _bfd_archive_coff_openr_next_archived_file \
-+ bfd_generic_openr_next_archived_file
-+#define _bfd_archive_coff_get_elt_at_index _bfd_generic_get_elt_at_index
-+#define _bfd_archive_coff_generic_stat_arch_elt \
-+ bfd_generic_stat_arch_elt
-+#define _bfd_archive_coff_update_armap_timestamp bfd_true
-+
-+/* Routines to use for BFD_JUMP_TABLE_SYMBOLS where there is no symbol
-+ support. Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols). */
-+
-+#define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1
-+#define _bfd_nosymbols_canonicalize_symtab \
-+ ((long (*) (bfd *, asymbol **)) _bfd_n1)
-+#define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol
-+#define _bfd_nosymbols_print_symbol \
-+ ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) bfd_void)
-+#define _bfd_nosymbols_get_symbol_info \
-+ ((void (*) (bfd *, asymbol *, symbol_info *)) bfd_void)
-+#define _bfd_nosymbols_bfd_is_local_label_name \
-+ ((bfd_boolean (*) (bfd *, const char *)) bfd_false)
-+#define _bfd_nosymbols_bfd_is_target_special_symbol \
-+ ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-+#define _bfd_nosymbols_get_lineno \
-+ ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr)
-+#define _bfd_nosymbols_find_nearest_line \
-+ ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \
-+ const char **, unsigned int *)) \
-+ bfd_false)
-+#define _bfd_nosymbols_find_inliner_info \
-+ ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \
-+ bfd_false)
-+#define _bfd_nosymbols_bfd_make_debug_symbol \
-+ ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr)
-+#define _bfd_nosymbols_read_minisymbols \
-+ ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) _bfd_n1)
-+#define _bfd_nosymbols_minisymbol_to_symbol \
-+ ((asymbol *(*) (bfd *, bfd_boolean, const void *, asymbol *)) \
-+ bfd_nullvoidptr)
-+
-+/* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
-+ support. Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs). */
-+
-+extern long _bfd_norelocs_get_reloc_upper_bound (bfd *, asection *);
-+extern long _bfd_norelocs_canonicalize_reloc (bfd *, asection *,
-+ arelent **, asymbol **);
-+#define _bfd_norelocs_bfd_reloc_type_lookup \
-+ ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr)
-+#define _bfd_norelocs_bfd_reloc_name_lookup \
-+ ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr)
-+
-+/* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not
-+ be written. Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite). */
-+
-+#define _bfd_nowrite_set_arch_mach \
-+ ((bfd_boolean (*) (bfd *, enum bfd_architecture, unsigned long)) \
-+ bfd_false)
-+#define _bfd_nowrite_set_section_contents \
-+ ((bfd_boolean (*) (bfd *, asection *, const void *, file_ptr, bfd_size_type)) \
-+ bfd_false)
-+
-+/* Generic routines to use for BFD_JUMP_TABLE_WRITE. Use
-+ BFD_JUMP_TABLE_WRITE (_bfd_generic). */
-+
-+#define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
-+extern bfd_boolean _bfd_generic_set_section_contents
-+ (bfd *, asection *, const void *, file_ptr, bfd_size_type);
-+
-+/* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
-+ support linking. Use BFD_JUMP_TABLE_LINK (_bfd_nolink). */
-+
-+#define _bfd_nolink_sizeof_headers \
-+ ((int (*) (bfd *, struct bfd_link_info *)) bfd_0)
-+#define _bfd_nolink_bfd_get_relocated_section_contents \
-+ ((bfd_byte *(*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \
-+ bfd_byte *, bfd_boolean, asymbol **)) \
-+ bfd_nullvoidptr)
-+#define _bfd_nolink_bfd_relax_section \
-+ ((bfd_boolean (*) \
-+ (bfd *, asection *, struct bfd_link_info *, bfd_boolean *)) \
-+ bfd_false)
-+#define _bfd_nolink_bfd_gc_sections \
-+ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
-+ bfd_false)
-+#define _bfd_nolink_bfd_merge_sections \
-+ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
-+ bfd_false)
-+#define _bfd_nolink_bfd_is_group_section \
-+ ((bfd_boolean (*) (bfd *, const struct bfd_section *)) \
-+ bfd_false)
-+#define _bfd_nolink_bfd_discard_group \
-+ ((bfd_boolean (*) (bfd *, struct bfd_section *)) \
-+ bfd_false)
-+#define _bfd_nolink_bfd_link_hash_table_create \
-+ ((struct bfd_link_hash_table *(*) (bfd *)) bfd_nullvoidptr)
-+#define _bfd_nolink_bfd_link_hash_table_free \
-+ ((void (*) (struct bfd_link_hash_table *)) bfd_void)
-+#define _bfd_nolink_bfd_link_add_symbols \
-+ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
-+#define _bfd_nolink_bfd_link_just_syms \
-+ ((void (*) (asection *, struct bfd_link_info *)) bfd_void)
-+#define _bfd_nolink_bfd_final_link \
-+ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
-+#define _bfd_nolink_bfd_link_split_section \
-+ ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false)
-+#define _bfd_nolink_section_already_linked \
-+ ((void (*) (bfd *, struct bfd_section *, struct bfd_link_info *)) bfd_void)
-+
-+/* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
-+ have dynamic symbols or relocs. Use BFD_JUMP_TABLE_DYNAMIC
-+ (_bfd_nodynamic). */
-+
-+#define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1
-+#define _bfd_nodynamic_canonicalize_dynamic_symtab \
-+ ((long (*) (bfd *, asymbol **)) _bfd_n1)
-+#define _bfd_nodynamic_get_synthetic_symtab \
-+ ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1)
-+#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
-+#define _bfd_nodynamic_canonicalize_dynamic_reloc \
-+ ((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1)
-+
-+/* Generic routine to determine of the given symbol is a local
-+ label. */
-+extern bfd_boolean bfd_generic_is_local_label_name
-+ (bfd *, const char *);
-+
-+/* Generic minisymbol routines. */
-+extern long _bfd_generic_read_minisymbols
-+ (bfd *, bfd_boolean, void **, unsigned int *);
-+extern asymbol *_bfd_generic_minisymbol_to_symbol
-+ (bfd *, bfd_boolean, const void *, asymbol *);
-+
-+/* Find the nearest line using .stab/.stabstr sections. */
-+extern bfd_boolean _bfd_stab_section_find_nearest_line
-+ (bfd *, asymbol **, asection *, bfd_vma, bfd_boolean *,
-+ const char **, const char **, unsigned int *, void **);
-+
-+/* Find the nearest line using DWARF 1 debugging information. */
-+extern bfd_boolean _bfd_dwarf1_find_nearest_line
-+ (bfd *, asection *, asymbol **, bfd_vma, const char **,
-+ const char **, unsigned int *);
-+
-+/* Find the nearest line using DWARF 2 debugging information. */
-+extern bfd_boolean _bfd_dwarf2_find_nearest_line
-+ (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
-+ unsigned int *, unsigned int, void **);
-+
-+/* Find the line using DWARF 2 debugging information. */
-+extern bfd_boolean _bfd_dwarf2_find_line
-+ (bfd *, asymbol **, asymbol *, const char **,
-+ unsigned int *, unsigned int, void **);
-+
-+bfd_boolean _bfd_generic_find_line
-+ (bfd *, asymbol **, asymbol *, const char **, unsigned int *);
-+
-+/* Find inliner info after calling bfd_find_nearest_line. */
-+extern bfd_boolean _bfd_dwarf2_find_inliner_info
-+ (bfd *, const char **, const char **, unsigned int *, void **);
-+
-+/* Create a new section entry. */
-+extern struct bfd_hash_entry *bfd_section_hash_newfunc
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+
-+/* A routine to create entries for a bfd_link_hash_table. */
-+extern struct bfd_hash_entry *_bfd_link_hash_newfunc
-+ (struct bfd_hash_entry *entry, struct bfd_hash_table *table,
-+ const char *string);
-+
-+/* Initialize a bfd_link_hash_table. */
-+extern bfd_boolean _bfd_link_hash_table_init
-+ (struct bfd_link_hash_table *, bfd *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int);
-+
-+/* Generic link hash table creation routine. */
-+extern struct bfd_link_hash_table *_bfd_generic_link_hash_table_create
-+ (bfd *);
-+
-+/* Generic link hash table destruction routine. */
-+extern void _bfd_generic_link_hash_table_free
-+ (struct bfd_link_hash_table *);
-+
-+/* Generic add symbol routine. */
-+extern bfd_boolean _bfd_generic_link_add_symbols
-+ (bfd *, struct bfd_link_info *);
-+
-+/* Generic add symbol routine. This version is used by targets for
-+ which the linker must collect constructors and destructors by name,
-+ as the collect2 program does. */
-+extern bfd_boolean _bfd_generic_link_add_symbols_collect
-+ (bfd *, struct bfd_link_info *);
-+
-+/* Generic archive add symbol routine. */
-+extern bfd_boolean _bfd_generic_link_add_archive_symbols
-+ (bfd *, struct bfd_link_info *,
-+ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *));
-+
-+/* Forward declaration to avoid prototype errors. */
-+typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
-+
-+/* Generic routine to add a single symbol. */
-+extern bfd_boolean _bfd_generic_link_add_one_symbol
-+ (struct bfd_link_info *, bfd *, const char *name, flagword,
-+ asection *, bfd_vma, const char *, bfd_boolean copy,
-+ bfd_boolean constructor, struct bfd_link_hash_entry **);
-+
-+/* Generic routine to mark section as supplying symbols only. */
-+extern void _bfd_generic_link_just_syms
-+ (asection *, struct bfd_link_info *);
-+
-+/* Generic link routine. */
-+extern bfd_boolean _bfd_generic_final_link
-+ (bfd *, struct bfd_link_info *);
-+
-+extern bfd_boolean _bfd_generic_link_split_section
-+ (bfd *, struct bfd_section *);
-+
-+extern void _bfd_generic_section_already_linked
-+ (bfd *, struct bfd_section *, struct bfd_link_info *);
-+
-+/* Generic reloc_link_order processing routine. */
-+extern bfd_boolean _bfd_generic_reloc_link_order
-+ (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
-+
-+/* Default link order processing routine. */
-+extern bfd_boolean _bfd_default_link_order
-+ (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
-+
-+/* Count the number of reloc entries in a link order list. */
-+extern unsigned int _bfd_count_link_order_relocs
-+ (struct bfd_link_order *);
-+
-+/* Final link relocation routine. */
-+extern bfd_reloc_status_type _bfd_final_link_relocate
-+ (reloc_howto_type *, bfd *, asection *, bfd_byte *,
-+ bfd_vma, bfd_vma, bfd_vma);
-+
-+/* Relocate a particular location by a howto and a value. */
-+extern bfd_reloc_status_type _bfd_relocate_contents
-+ (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *);
-+
-+/* Clear a given location using a given howto. */
-+extern void _bfd_clear_contents (reloc_howto_type *howto, bfd *input_bfd,
-+ bfd_byte *location);
-+
-+/* Link stabs in sections in the first pass. */
-+
-+extern bfd_boolean _bfd_link_section_stabs
-+ (bfd *, struct stab_info *, asection *, asection *, void **,
-+ bfd_size_type *);
-+
-+/* Eliminate stabs for discarded functions and symbols. */
-+extern bfd_boolean _bfd_discard_section_stabs
-+ (bfd *, asection *, void *, bfd_boolean (*) (bfd_vma, void *), void *);
-+
-+/* Write out the .stab section when linking stabs in sections. */
-+
-+extern bfd_boolean _bfd_write_section_stabs
-+ (bfd *, struct stab_info *, asection *, void **, bfd_byte *);
-+
-+/* Write out the .stabstr string table when linking stabs in sections. */
-+
-+extern bfd_boolean _bfd_write_stab_strings
-+ (bfd *, struct stab_info *);
-+
-+/* Find an offset within a .stab section when linking stabs in
-+ sections. */
-+
-+extern bfd_vma _bfd_stab_section_offset
-+ (asection *, void *, bfd_vma);
-+
-+/* Register a SEC_MERGE section as a candidate for merging. */
-+
-+extern bfd_boolean _bfd_add_merge_section
-+ (bfd *, void **, asection *, void **);
-+
-+/* Attempt to merge SEC_MERGE sections. */
-+
-+extern bfd_boolean _bfd_merge_sections
-+ (bfd *, struct bfd_link_info *, void *, void (*) (bfd *, asection *));
-+
-+/* Write out a merged section. */
-+
-+extern bfd_boolean _bfd_write_merged_section
-+ (bfd *, asection *, void *);
-+
-+/* Find an offset within a modified SEC_MERGE section. */
-+
-+extern bfd_vma _bfd_merged_section_offset
-+ (bfd *, asection **, void *, bfd_vma);
-+
-+/* Create a string table. */
-+extern struct bfd_strtab_hash *_bfd_stringtab_init
-+ (void);
-+
-+/* Create an XCOFF .debug section style string table. */
-+extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init
-+ (void);
-+
-+/* Free a string table. */
-+extern void _bfd_stringtab_free
-+ (struct bfd_strtab_hash *);
-+
-+/* Get the size of a string table. */
-+extern bfd_size_type _bfd_stringtab_size
-+ (struct bfd_strtab_hash *);
-+
-+/* Add a string to a string table. */
-+extern bfd_size_type _bfd_stringtab_add
-+ (struct bfd_strtab_hash *, const char *, bfd_boolean hash, bfd_boolean copy);
-+
-+/* Write out a string table. */
-+extern bfd_boolean _bfd_stringtab_emit
-+ (bfd *, struct bfd_strtab_hash *);
-+
-+/* Check that endianness of input and output file match. */
-+extern bfd_boolean _bfd_generic_verify_endian_match
-+ (bfd *, bfd *);
-+
-+/* Macros to tell if bfds are read or write enabled.
-+
-+ Note that bfds open for read may be scribbled into if the fd passed
-+ to bfd_fdopenr is actually open both for read and write
-+ simultaneously. However an output bfd will never be open for
-+ read. Therefore sometimes you want to check bfd_read_p or
-+ !bfd_read_p, and only sometimes bfd_write_p.
-+*/
-+
-+#define bfd_read_p(abfd) \
-+ ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
-+#define bfd_write_p(abfd) \
-+ ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
-+
-+void bfd_assert
-+ (const char*,int);
-+
-+#define BFD_ASSERT(x) \
-+ do { if (!(x)) bfd_assert(__FILE__,__LINE__); } while (0)
-+
-+#define BFD_FAIL() \
-+ do { bfd_assert(__FILE__,__LINE__); } while (0)
-+
-+extern void _bfd_abort
-+ (const char *, int, const char *) ATTRIBUTE_NORETURN;
-+
-+/* if gcc >= 2.6, we can give a function name, too */
-+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
-+#define __PRETTY_FUNCTION__ ((char *) NULL)
-+#endif
-+
-+#undef abort
-+#define abort() _bfd_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
-+
-+/* Manipulate a system FILE but using BFD's "file_ptr", rather than
-+ the system "off_t" or "off64_t", as the offset. */
-+extern file_ptr real_ftell (FILE *file);
-+extern int real_fseek (FILE *file, file_ptr offset, int whence);
-+extern FILE *real_fopen (const char *filename, const char *modes);
-+
-+/* List of supported target vectors, and the default vector (if
-+ bfd_default_vector[0] is NULL, there is no default). */
-+extern const bfd_target * const *bfd_target_vector;
-+extern const bfd_target *bfd_default_vector[];
-+
-+/* List of associated target vectors. */
-+extern const bfd_target * const *bfd_associated_vector;
-+
-+/* Functions shared by the ECOFF and MIPS ELF backends, which have no
-+ other common header files. */
-+
-+#if defined(__STDC__) || defined(ALMOST_STDC)
-+struct ecoff_find_line;
-+#endif
-+
-+extern bfd_boolean _bfd_ecoff_locate_line
-+ (bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
-+ const struct ecoff_debug_swap * const, struct ecoff_find_line *,
-+ const char **, const char **, unsigned int *);
-+extern bfd_boolean _bfd_ecoff_get_accumulated_pdr
-+ (void *, bfd_byte *);
-+extern bfd_boolean _bfd_ecoff_get_accumulated_sym
-+ (void *, bfd_byte *);
-+extern bfd_boolean _bfd_ecoff_get_accumulated_ss
-+ (void *, bfd_byte *);
-+
-+extern bfd_vma _bfd_get_gp_value
-+ (bfd *);
-+extern void _bfd_set_gp_value
-+ (bfd *, bfd_vma);
-+
-+/* Function shared by the COFF and ELF SH backends, which have no
-+ other common header files. */
-+
-+#ifndef _bfd_sh_align_load_span
-+extern bfd_boolean _bfd_sh_align_load_span
-+ (bfd *, asection *, bfd_byte *,
-+ bfd_boolean (*) (bfd *, asection *, void *, bfd_byte *, bfd_vma),
-+ void *, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *);
-+#endif
-+
-+/* This is the shape of the elements inside the already_linked hash
-+ table. It maps a name onto a list of already_linked elements with
-+ the same name. */
-+
-+struct bfd_section_already_linked_hash_entry
-+{
-+ struct bfd_hash_entry root;
-+ struct bfd_section_already_linked *entry;
-+};
-+
-+struct bfd_section_already_linked
-+{
-+ struct bfd_section_already_linked *next;
-+ asection *sec;
-+};
-+
-+extern struct bfd_section_already_linked_hash_entry *
-+ bfd_section_already_linked_table_lookup (const char *);
-+extern bfd_boolean bfd_section_already_linked_table_insert
-+ (struct bfd_section_already_linked_hash_entry *, asection *);
-+extern void bfd_section_already_linked_table_traverse
-+ (bfd_boolean (*) (struct bfd_section_already_linked_hash_entry *,
-+ void *), void *);
-+
-+extern bfd_vma read_unsigned_leb128 (bfd *, bfd_byte *, unsigned int *);
-+extern bfd_signed_vma read_signed_leb128 (bfd *, bfd_byte *, unsigned int *);
-+
-+/* Extracted from init.c. */
-+/* Extracted from libbfd.c. */
-+bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
-+
-+unsigned int bfd_log2 (bfd_vma x);
-+
-+/* Extracted from bfdio.c. */
-+struct bfd_iovec
-+{
-+ /* To avoid problems with macros, a "b" rather than "f"
-+ prefix is prepended to each method name. */
-+ /* Attempt to read/write NBYTES on ABFD's IOSTREAM storing/fetching
-+ bytes starting at PTR. Return the number of bytes actually
-+ transfered (a read past end-of-file returns less than NBYTES),
-+ or -1 (setting <<bfd_error>>) if an error occurs. */
-+ file_ptr (*bread) (struct bfd *abfd, void *ptr, file_ptr nbytes);
-+ file_ptr (*bwrite) (struct bfd *abfd, const void *ptr,
-+ file_ptr nbytes);
-+ /* Return the current IOSTREAM file offset, or -1 (setting <<bfd_error>>
-+ if an error occurs. */
-+ file_ptr (*btell) (struct bfd *abfd);
-+ /* For the following, on successful completion a value of 0 is returned.
-+ Otherwise, a value of -1 is returned (and <<bfd_error>> is set). */
-+ int (*bseek) (struct bfd *abfd, file_ptr offset, int whence);
-+ int (*bclose) (struct bfd *abfd);
-+ int (*bflush) (struct bfd *abfd);
-+ int (*bstat) (struct bfd *abfd, struct stat *sb);
-+};
-+/* Extracted from bfdwin.c. */
-+struct _bfd_window_internal {
-+ struct _bfd_window_internal *next;
-+ void *data;
-+ bfd_size_type size;
-+ int refcount : 31; /* should be enough... */
-+ unsigned mapped : 1; /* 1 = mmap, 0 = malloc */
-+};
-+/* Extracted from cache.c. */
-+bfd_boolean bfd_cache_init (bfd *abfd);
-+
-+bfd_boolean bfd_cache_close (bfd *abfd);
-+
-+FILE* bfd_open_file (bfd *abfd);
-+
-+/* Extracted from reloc.c. */
-+#ifdef _BFD_MAKE_TABLE_bfd_reloc_code_real
-+
-+static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
-+
-+ "BFD_RELOC_64",
-+ "BFD_RELOC_32",
-+ "BFD_RELOC_26",
-+ "BFD_RELOC_24",
-+ "BFD_RELOC_16",
-+ "BFD_RELOC_14",
-+ "BFD_RELOC_8",
-+ "BFD_RELOC_64_PCREL",
-+ "BFD_RELOC_32_PCREL",
-+ "BFD_RELOC_24_PCREL",
-+ "BFD_RELOC_16_PCREL",
-+ "BFD_RELOC_12_PCREL",
-+ "BFD_RELOC_8_PCREL",
-+ "BFD_RELOC_32_SECREL",
-+ "BFD_RELOC_32_GOT_PCREL",
-+ "BFD_RELOC_16_GOT_PCREL",
-+ "BFD_RELOC_8_GOT_PCREL",
-+ "BFD_RELOC_32_GOTOFF",
-+ "BFD_RELOC_16_GOTOFF",
-+ "BFD_RELOC_LO16_GOTOFF",
-+ "BFD_RELOC_HI16_GOTOFF",
-+ "BFD_RELOC_HI16_S_GOTOFF",
-+ "BFD_RELOC_8_GOTOFF",
-+ "BFD_RELOC_64_PLT_PCREL",
-+ "BFD_RELOC_32_PLT_PCREL",
-+ "BFD_RELOC_24_PLT_PCREL",
-+ "BFD_RELOC_16_PLT_PCREL",
-+ "BFD_RELOC_8_PLT_PCREL",
-+ "BFD_RELOC_64_PLTOFF",
-+ "BFD_RELOC_32_PLTOFF",
-+ "BFD_RELOC_16_PLTOFF",
-+ "BFD_RELOC_LO16_PLTOFF",
-+ "BFD_RELOC_HI16_PLTOFF",
-+ "BFD_RELOC_HI16_S_PLTOFF",
-+ "BFD_RELOC_8_PLTOFF",
-+ "BFD_RELOC_68K_GLOB_DAT",
-+ "BFD_RELOC_68K_JMP_SLOT",
-+ "BFD_RELOC_68K_RELATIVE",
-+ "BFD_RELOC_32_BASEREL",
-+ "BFD_RELOC_16_BASEREL",
-+ "BFD_RELOC_LO16_BASEREL",
-+ "BFD_RELOC_HI16_BASEREL",
-+ "BFD_RELOC_HI16_S_BASEREL",
-+ "BFD_RELOC_8_BASEREL",
-+ "BFD_RELOC_RVA",
-+ "BFD_RELOC_8_FFnn",
-+ "BFD_RELOC_32_PCREL_S2",
-+ "BFD_RELOC_16_PCREL_S2",
-+ "BFD_RELOC_23_PCREL_S2",
-+ "BFD_RELOC_HI22",
-+ "BFD_RELOC_LO10",
-+ "BFD_RELOC_GPREL16",
-+ "BFD_RELOC_GPREL32",
-+ "BFD_RELOC_I960_CALLJ",
-+ "BFD_RELOC_NONE",
-+ "BFD_RELOC_SPARC_WDISP22",
-+ "BFD_RELOC_SPARC22",
-+ "BFD_RELOC_SPARC13",
-+ "BFD_RELOC_SPARC_GOT10",
-+ "BFD_RELOC_SPARC_GOT13",
-+ "BFD_RELOC_SPARC_GOT22",
-+ "BFD_RELOC_SPARC_PC10",
-+ "BFD_RELOC_SPARC_PC22",
-+ "BFD_RELOC_SPARC_WPLT30",
-+ "BFD_RELOC_SPARC_COPY",
-+ "BFD_RELOC_SPARC_GLOB_DAT",
-+ "BFD_RELOC_SPARC_JMP_SLOT",
-+ "BFD_RELOC_SPARC_RELATIVE",
-+ "BFD_RELOC_SPARC_UA16",
-+ "BFD_RELOC_SPARC_UA32",
-+ "BFD_RELOC_SPARC_UA64",
-+ "BFD_RELOC_SPARC_BASE13",
-+ "BFD_RELOC_SPARC_BASE22",
-+ "BFD_RELOC_SPARC_10",
-+ "BFD_RELOC_SPARC_11",
-+ "BFD_RELOC_SPARC_OLO10",
-+ "BFD_RELOC_SPARC_HH22",
-+ "BFD_RELOC_SPARC_HM10",
-+ "BFD_RELOC_SPARC_LM22",
-+ "BFD_RELOC_SPARC_PC_HH22",
-+ "BFD_RELOC_SPARC_PC_HM10",
-+ "BFD_RELOC_SPARC_PC_LM22",
-+ "BFD_RELOC_SPARC_WDISP16",
-+ "BFD_RELOC_SPARC_WDISP19",
-+ "BFD_RELOC_SPARC_7",
-+ "BFD_RELOC_SPARC_6",
-+ "BFD_RELOC_SPARC_5",
-+ "BFD_RELOC_SPARC_PLT32",
-+ "BFD_RELOC_SPARC_PLT64",
-+ "BFD_RELOC_SPARC_HIX22",
-+ "BFD_RELOC_SPARC_LOX10",
-+ "BFD_RELOC_SPARC_H44",
-+ "BFD_RELOC_SPARC_M44",
-+ "BFD_RELOC_SPARC_L44",
-+ "BFD_RELOC_SPARC_REGISTER",
-+ "BFD_RELOC_SPARC_REV32",
-+ "BFD_RELOC_SPARC_TLS_GD_HI22",
-+ "BFD_RELOC_SPARC_TLS_GD_LO10",
-+ "BFD_RELOC_SPARC_TLS_GD_ADD",
-+ "BFD_RELOC_SPARC_TLS_GD_CALL",
-+ "BFD_RELOC_SPARC_TLS_LDM_HI22",
-+ "BFD_RELOC_SPARC_TLS_LDM_LO10",
-+ "BFD_RELOC_SPARC_TLS_LDM_ADD",
-+ "BFD_RELOC_SPARC_TLS_LDM_CALL",
-+ "BFD_RELOC_SPARC_TLS_LDO_HIX22",
-+ "BFD_RELOC_SPARC_TLS_LDO_LOX10",
-+ "BFD_RELOC_SPARC_TLS_LDO_ADD",
-+ "BFD_RELOC_SPARC_TLS_IE_HI22",
-+ "BFD_RELOC_SPARC_TLS_IE_LO10",
-+ "BFD_RELOC_SPARC_TLS_IE_LD",
-+ "BFD_RELOC_SPARC_TLS_IE_LDX",
-+ "BFD_RELOC_SPARC_TLS_IE_ADD",
-+ "BFD_RELOC_SPARC_TLS_LE_HIX22",
-+ "BFD_RELOC_SPARC_TLS_LE_LOX10",
-+ "BFD_RELOC_SPARC_TLS_DTPMOD32",
-+ "BFD_RELOC_SPARC_TLS_DTPMOD64",
-+ "BFD_RELOC_SPARC_TLS_DTPOFF32",
-+ "BFD_RELOC_SPARC_TLS_DTPOFF64",
-+ "BFD_RELOC_SPARC_TLS_TPOFF32",
-+ "BFD_RELOC_SPARC_TLS_TPOFF64",
-+ "BFD_RELOC_SPU_IMM7",
-+ "BFD_RELOC_SPU_IMM8",
-+ "BFD_RELOC_SPU_IMM10",
-+ "BFD_RELOC_SPU_IMM10W",
-+ "BFD_RELOC_SPU_IMM16",
-+ "BFD_RELOC_SPU_IMM16W",
-+ "BFD_RELOC_SPU_IMM18",
-+ "BFD_RELOC_SPU_PCREL9a",
-+ "BFD_RELOC_SPU_PCREL9b",
-+ "BFD_RELOC_SPU_PCREL16",
-+ "BFD_RELOC_SPU_LO16",
-+ "BFD_RELOC_SPU_HI16",
-+ "BFD_RELOC_SPU_PPU32",
-+ "BFD_RELOC_SPU_PPU64",
-+ "BFD_RELOC_ALPHA_GPDISP_HI16",
-+ "BFD_RELOC_ALPHA_GPDISP_LO16",
-+ "BFD_RELOC_ALPHA_GPDISP",
-+ "BFD_RELOC_ALPHA_LITERAL",
-+ "BFD_RELOC_ALPHA_ELF_LITERAL",
-+ "BFD_RELOC_ALPHA_LITUSE",
-+ "BFD_RELOC_ALPHA_HINT",
-+ "BFD_RELOC_ALPHA_LINKAGE",
-+ "BFD_RELOC_ALPHA_CODEADDR",
-+ "BFD_RELOC_ALPHA_GPREL_HI16",
-+ "BFD_RELOC_ALPHA_GPREL_LO16",
-+ "BFD_RELOC_ALPHA_BRSGP",
-+ "BFD_RELOC_ALPHA_TLSGD",
-+ "BFD_RELOC_ALPHA_TLSLDM",
-+ "BFD_RELOC_ALPHA_DTPMOD64",
-+ "BFD_RELOC_ALPHA_GOTDTPREL16",
-+ "BFD_RELOC_ALPHA_DTPREL64",
-+ "BFD_RELOC_ALPHA_DTPREL_HI16",
-+ "BFD_RELOC_ALPHA_DTPREL_LO16",
-+ "BFD_RELOC_ALPHA_DTPREL16",
-+ "BFD_RELOC_ALPHA_GOTTPREL16",
-+ "BFD_RELOC_ALPHA_TPREL64",
-+ "BFD_RELOC_ALPHA_TPREL_HI16",
-+ "BFD_RELOC_ALPHA_TPREL_LO16",
-+ "BFD_RELOC_ALPHA_TPREL16",
-+ "BFD_RELOC_MIPS_JMP",
-+ "BFD_RELOC_MIPS16_JMP",
-+ "BFD_RELOC_MIPS16_GPREL",
-+ "BFD_RELOC_HI16",
-+ "BFD_RELOC_HI16_S",
-+ "BFD_RELOC_LO16",
-+ "BFD_RELOC_HI16_PCREL",
-+ "BFD_RELOC_HI16_S_PCREL",
-+ "BFD_RELOC_LO16_PCREL",
-+ "BFD_RELOC_MIPS16_HI16",
-+ "BFD_RELOC_MIPS16_HI16_S",
-+ "BFD_RELOC_MIPS16_LO16",
-+ "BFD_RELOC_MIPS_LITERAL",
-+ "BFD_RELOC_MIPS_GOT16",
-+ "BFD_RELOC_MIPS_CALL16",
-+ "BFD_RELOC_MIPS_GOT_HI16",
-+ "BFD_RELOC_MIPS_GOT_LO16",
-+ "BFD_RELOC_MIPS_CALL_HI16",
-+ "BFD_RELOC_MIPS_CALL_LO16",
-+ "BFD_RELOC_MIPS_SUB",
-+ "BFD_RELOC_MIPS_GOT_PAGE",
-+ "BFD_RELOC_MIPS_GOT_OFST",
-+ "BFD_RELOC_MIPS_GOT_DISP",
-+ "BFD_RELOC_MIPS_SHIFT5",
-+ "BFD_RELOC_MIPS_SHIFT6",
-+ "BFD_RELOC_MIPS_INSERT_A",
-+ "BFD_RELOC_MIPS_INSERT_B",
-+ "BFD_RELOC_MIPS_DELETE",
-+ "BFD_RELOC_MIPS_HIGHEST",
-+ "BFD_RELOC_MIPS_HIGHER",
-+ "BFD_RELOC_MIPS_SCN_DISP",
-+ "BFD_RELOC_MIPS_REL16",
-+ "BFD_RELOC_MIPS_RELGOT",
-+ "BFD_RELOC_MIPS_JALR",
-+ "BFD_RELOC_MIPS_TLS_DTPMOD32",
-+ "BFD_RELOC_MIPS_TLS_DTPREL32",
-+ "BFD_RELOC_MIPS_TLS_DTPMOD64",
-+ "BFD_RELOC_MIPS_TLS_DTPREL64",
-+ "BFD_RELOC_MIPS_TLS_GD",
-+ "BFD_RELOC_MIPS_TLS_LDM",
-+ "BFD_RELOC_MIPS_TLS_DTPREL_HI16",
-+ "BFD_RELOC_MIPS_TLS_DTPREL_LO16",
-+ "BFD_RELOC_MIPS_TLS_GOTTPREL",
-+ "BFD_RELOC_MIPS_TLS_TPREL32",
-+ "BFD_RELOC_MIPS_TLS_TPREL64",
-+ "BFD_RELOC_MIPS_TLS_TPREL_HI16",
-+ "BFD_RELOC_MIPS_TLS_TPREL_LO16",
-+
-+ "BFD_RELOC_MIPS_COPY",
-+ "BFD_RELOC_MIPS_JUMP_SLOT",
-+
-+ "BFD_RELOC_FRV_LABEL16",
-+ "BFD_RELOC_FRV_LABEL24",
-+ "BFD_RELOC_FRV_LO16",
-+ "BFD_RELOC_FRV_HI16",
-+ "BFD_RELOC_FRV_GPREL12",
-+ "BFD_RELOC_FRV_GPRELU12",
-+ "BFD_RELOC_FRV_GPREL32",
-+ "BFD_RELOC_FRV_GPRELHI",
-+ "BFD_RELOC_FRV_GPRELLO",
-+ "BFD_RELOC_FRV_GOT12",
-+ "BFD_RELOC_FRV_GOTHI",
-+ "BFD_RELOC_FRV_GOTLO",
-+ "BFD_RELOC_FRV_FUNCDESC",
-+ "BFD_RELOC_FRV_FUNCDESC_GOT12",
-+ "BFD_RELOC_FRV_FUNCDESC_GOTHI",
-+ "BFD_RELOC_FRV_FUNCDESC_GOTLO",
-+ "BFD_RELOC_FRV_FUNCDESC_VALUE",
-+ "BFD_RELOC_FRV_FUNCDESC_GOTOFF12",
-+ "BFD_RELOC_FRV_FUNCDESC_GOTOFFHI",
-+ "BFD_RELOC_FRV_FUNCDESC_GOTOFFLO",
-+ "BFD_RELOC_FRV_GOTOFF12",
-+ "BFD_RELOC_FRV_GOTOFFHI",
-+ "BFD_RELOC_FRV_GOTOFFLO",
-+ "BFD_RELOC_FRV_GETTLSOFF",
-+ "BFD_RELOC_FRV_TLSDESC_VALUE",
-+ "BFD_RELOC_FRV_GOTTLSDESC12",
-+ "BFD_RELOC_FRV_GOTTLSDESCHI",
-+ "BFD_RELOC_FRV_GOTTLSDESCLO",
-+ "BFD_RELOC_FRV_TLSMOFF12",
-+ "BFD_RELOC_FRV_TLSMOFFHI",
-+ "BFD_RELOC_FRV_TLSMOFFLO",
-+ "BFD_RELOC_FRV_GOTTLSOFF12",
-+ "BFD_RELOC_FRV_GOTTLSOFFHI",
-+ "BFD_RELOC_FRV_GOTTLSOFFLO",
-+ "BFD_RELOC_FRV_TLSOFF",
-+ "BFD_RELOC_FRV_TLSDESC_RELAX",
-+ "BFD_RELOC_FRV_GETTLSOFF_RELAX",
-+ "BFD_RELOC_FRV_TLSOFF_RELAX",
-+ "BFD_RELOC_FRV_TLSMOFF",
-+
-+ "BFD_RELOC_MN10300_GOTOFF24",
-+ "BFD_RELOC_MN10300_GOT32",
-+ "BFD_RELOC_MN10300_GOT24",
-+ "BFD_RELOC_MN10300_GOT16",
-+ "BFD_RELOC_MN10300_COPY",
-+ "BFD_RELOC_MN10300_GLOB_DAT",
-+ "BFD_RELOC_MN10300_JMP_SLOT",
-+ "BFD_RELOC_MN10300_RELATIVE",
-+
-+ "BFD_RELOC_386_GOT32",
-+ "BFD_RELOC_386_PLT32",
-+ "BFD_RELOC_386_COPY",
-+ "BFD_RELOC_386_GLOB_DAT",
-+ "BFD_RELOC_386_JUMP_SLOT",
-+ "BFD_RELOC_386_RELATIVE",
-+ "BFD_RELOC_386_GOTOFF",
-+ "BFD_RELOC_386_GOTPC",
-+ "BFD_RELOC_386_TLS_TPOFF",
-+ "BFD_RELOC_386_TLS_IE",
-+ "BFD_RELOC_386_TLS_GOTIE",
-+ "BFD_RELOC_386_TLS_LE",
-+ "BFD_RELOC_386_TLS_GD",
-+ "BFD_RELOC_386_TLS_LDM",
-+ "BFD_RELOC_386_TLS_LDO_32",
-+ "BFD_RELOC_386_TLS_IE_32",
-+ "BFD_RELOC_386_TLS_LE_32",
-+ "BFD_RELOC_386_TLS_DTPMOD32",
-+ "BFD_RELOC_386_TLS_DTPOFF32",
-+ "BFD_RELOC_386_TLS_TPOFF32",
-+ "BFD_RELOC_386_TLS_GOTDESC",
-+ "BFD_RELOC_386_TLS_DESC_CALL",
-+ "BFD_RELOC_386_TLS_DESC",
-+ "BFD_RELOC_X86_64_GOT32",
-+ "BFD_RELOC_X86_64_PLT32",
-+ "BFD_RELOC_X86_64_COPY",
-+ "BFD_RELOC_X86_64_GLOB_DAT",
-+ "BFD_RELOC_X86_64_JUMP_SLOT",
-+ "BFD_RELOC_X86_64_RELATIVE",
-+ "BFD_RELOC_X86_64_GOTPCREL",
-+ "BFD_RELOC_X86_64_32S",
-+ "BFD_RELOC_X86_64_DTPMOD64",
-+ "BFD_RELOC_X86_64_DTPOFF64",
-+ "BFD_RELOC_X86_64_TPOFF64",
-+ "BFD_RELOC_X86_64_TLSGD",
-+ "BFD_RELOC_X86_64_TLSLD",
-+ "BFD_RELOC_X86_64_DTPOFF32",
-+ "BFD_RELOC_X86_64_GOTTPOFF",
-+ "BFD_RELOC_X86_64_TPOFF32",
-+ "BFD_RELOC_X86_64_GOTOFF64",
-+ "BFD_RELOC_X86_64_GOTPC32",
-+ "BFD_RELOC_X86_64_GOT64",
-+ "BFD_RELOC_X86_64_GOTPCREL64",
-+ "BFD_RELOC_X86_64_GOTPC64",
-+ "BFD_RELOC_X86_64_GOTPLT64",
-+ "BFD_RELOC_X86_64_PLTOFF64",
-+ "BFD_RELOC_X86_64_GOTPC32_TLSDESC",
-+ "BFD_RELOC_X86_64_TLSDESC_CALL",
-+ "BFD_RELOC_X86_64_TLSDESC",
-+ "BFD_RELOC_NS32K_IMM_8",
-+ "BFD_RELOC_NS32K_IMM_16",
-+ "BFD_RELOC_NS32K_IMM_32",
-+ "BFD_RELOC_NS32K_IMM_8_PCREL",
-+ "BFD_RELOC_NS32K_IMM_16_PCREL",
-+ "BFD_RELOC_NS32K_IMM_32_PCREL",
-+ "BFD_RELOC_NS32K_DISP_8",
-+ "BFD_RELOC_NS32K_DISP_16",
-+ "BFD_RELOC_NS32K_DISP_32",
-+ "BFD_RELOC_NS32K_DISP_8_PCREL",
-+ "BFD_RELOC_NS32K_DISP_16_PCREL",
-+ "BFD_RELOC_NS32K_DISP_32_PCREL",
-+ "BFD_RELOC_PDP11_DISP_8_PCREL",
-+ "BFD_RELOC_PDP11_DISP_6_PCREL",
-+ "BFD_RELOC_PJ_CODE_HI16",
-+ "BFD_RELOC_PJ_CODE_LO16",
-+ "BFD_RELOC_PJ_CODE_DIR16",
-+ "BFD_RELOC_PJ_CODE_DIR32",
-+ "BFD_RELOC_PJ_CODE_REL16",
-+ "BFD_RELOC_PJ_CODE_REL32",
-+ "BFD_RELOC_PPC_B26",
-+ "BFD_RELOC_PPC_BA26",
-+ "BFD_RELOC_PPC_TOC16",
-+ "BFD_RELOC_PPC_B16",
-+ "BFD_RELOC_PPC_B16_BRTAKEN",
-+ "BFD_RELOC_PPC_B16_BRNTAKEN",
-+ "BFD_RELOC_PPC_BA16",
-+ "BFD_RELOC_PPC_BA16_BRTAKEN",
-+ "BFD_RELOC_PPC_BA16_BRNTAKEN",
-+ "BFD_RELOC_PPC_COPY",
-+ "BFD_RELOC_PPC_GLOB_DAT",
-+ "BFD_RELOC_PPC_JMP_SLOT",
-+ "BFD_RELOC_PPC_RELATIVE",
-+ "BFD_RELOC_PPC_LOCAL24PC",
-+ "BFD_RELOC_PPC_EMB_NADDR32",
-+ "BFD_RELOC_PPC_EMB_NADDR16",
-+ "BFD_RELOC_PPC_EMB_NADDR16_LO",
-+ "BFD_RELOC_PPC_EMB_NADDR16_HI",
-+ "BFD_RELOC_PPC_EMB_NADDR16_HA",
-+ "BFD_RELOC_PPC_EMB_SDAI16",
-+ "BFD_RELOC_PPC_EMB_SDA2I16",
-+ "BFD_RELOC_PPC_EMB_SDA2REL",
-+ "BFD_RELOC_PPC_EMB_SDA21",
-+ "BFD_RELOC_PPC_EMB_MRKREF",
-+ "BFD_RELOC_PPC_EMB_RELSEC16",
-+ "BFD_RELOC_PPC_EMB_RELST_LO",
-+ "BFD_RELOC_PPC_EMB_RELST_HI",
-+ "BFD_RELOC_PPC_EMB_RELST_HA",
-+ "BFD_RELOC_PPC_EMB_BIT_FLD",
-+ "BFD_RELOC_PPC_EMB_RELSDA",
-+ "BFD_RELOC_PPC64_HIGHER",
-+ "BFD_RELOC_PPC64_HIGHER_S",
-+ "BFD_RELOC_PPC64_HIGHEST",
-+ "BFD_RELOC_PPC64_HIGHEST_S",
-+ "BFD_RELOC_PPC64_TOC16_LO",
-+ "BFD_RELOC_PPC64_TOC16_HI",
-+ "BFD_RELOC_PPC64_TOC16_HA",
-+ "BFD_RELOC_PPC64_TOC",
-+ "BFD_RELOC_PPC64_PLTGOT16",
-+ "BFD_RELOC_PPC64_PLTGOT16_LO",
-+ "BFD_RELOC_PPC64_PLTGOT16_HI",
-+ "BFD_RELOC_PPC64_PLTGOT16_HA",
-+ "BFD_RELOC_PPC64_ADDR16_DS",
-+ "BFD_RELOC_PPC64_ADDR16_LO_DS",
-+ "BFD_RELOC_PPC64_GOT16_DS",
-+ "BFD_RELOC_PPC64_GOT16_LO_DS",
-+ "BFD_RELOC_PPC64_PLT16_LO_DS",
-+ "BFD_RELOC_PPC64_SECTOFF_DS",
-+ "BFD_RELOC_PPC64_SECTOFF_LO_DS",
-+ "BFD_RELOC_PPC64_TOC16_DS",
-+ "BFD_RELOC_PPC64_TOC16_LO_DS",
-+ "BFD_RELOC_PPC64_PLTGOT16_DS",
-+ "BFD_RELOC_PPC64_PLTGOT16_LO_DS",
-+ "BFD_RELOC_PPC_TLS",
-+ "BFD_RELOC_PPC_DTPMOD",
-+ "BFD_RELOC_PPC_TPREL16",
-+ "BFD_RELOC_PPC_TPREL16_LO",
-+ "BFD_RELOC_PPC_TPREL16_HI",
-+ "BFD_RELOC_PPC_TPREL16_HA",
-+ "BFD_RELOC_PPC_TPREL",
-+ "BFD_RELOC_PPC_DTPREL16",
-+ "BFD_RELOC_PPC_DTPREL16_LO",
-+ "BFD_RELOC_PPC_DTPREL16_HI",
-+ "BFD_RELOC_PPC_DTPREL16_HA",
-+ "BFD_RELOC_PPC_DTPREL",
-+ "BFD_RELOC_PPC_GOT_TLSGD16",
-+ "BFD_RELOC_PPC_GOT_TLSGD16_LO",
-+ "BFD_RELOC_PPC_GOT_TLSGD16_HI",
-+ "BFD_RELOC_PPC_GOT_TLSGD16_HA",
-+ "BFD_RELOC_PPC_GOT_TLSLD16",
-+ "BFD_RELOC_PPC_GOT_TLSLD16_LO",
-+ "BFD_RELOC_PPC_GOT_TLSLD16_HI",
-+ "BFD_RELOC_PPC_GOT_TLSLD16_HA",
-+ "BFD_RELOC_PPC_GOT_TPREL16",
-+ "BFD_RELOC_PPC_GOT_TPREL16_LO",
-+ "BFD_RELOC_PPC_GOT_TPREL16_HI",
-+ "BFD_RELOC_PPC_GOT_TPREL16_HA",
-+ "BFD_RELOC_PPC_GOT_DTPREL16",
-+ "BFD_RELOC_PPC_GOT_DTPREL16_LO",
-+ "BFD_RELOC_PPC_GOT_DTPREL16_HI",
-+ "BFD_RELOC_PPC_GOT_DTPREL16_HA",
-+ "BFD_RELOC_PPC64_TPREL16_DS",
-+ "BFD_RELOC_PPC64_TPREL16_LO_DS",
-+ "BFD_RELOC_PPC64_TPREL16_HIGHER",
-+ "BFD_RELOC_PPC64_TPREL16_HIGHERA",
-+ "BFD_RELOC_PPC64_TPREL16_HIGHEST",
-+ "BFD_RELOC_PPC64_TPREL16_HIGHESTA",
-+ "BFD_RELOC_PPC64_DTPREL16_DS",
-+ "BFD_RELOC_PPC64_DTPREL16_LO_DS",
-+ "BFD_RELOC_PPC64_DTPREL16_HIGHER",
-+ "BFD_RELOC_PPC64_DTPREL16_HIGHERA",
-+ "BFD_RELOC_PPC64_DTPREL16_HIGHEST",
-+ "BFD_RELOC_PPC64_DTPREL16_HIGHESTA",
-+ "BFD_RELOC_I370_D12",
-+ "BFD_RELOC_CTOR",
-+ "BFD_RELOC_ARM_PCREL_BRANCH",
-+ "BFD_RELOC_ARM_PCREL_BLX",
-+ "BFD_RELOC_THUMB_PCREL_BLX",
-+ "BFD_RELOC_ARM_PCREL_CALL",
-+ "BFD_RELOC_ARM_PCREL_JUMP",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH7",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH9",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH12",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH20",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH23",
-+ "BFD_RELOC_THUMB_PCREL_BRANCH25",
-+ "BFD_RELOC_ARM_OFFSET_IMM",
-+ "BFD_RELOC_ARM_THUMB_OFFSET",
-+ "BFD_RELOC_ARM_TARGET1",
-+ "BFD_RELOC_ARM_ROSEGREL32",
-+ "BFD_RELOC_ARM_SBREL32",
-+ "BFD_RELOC_ARM_TARGET2",
-+ "BFD_RELOC_ARM_PREL31",
-+ "BFD_RELOC_ARM_MOVW",
-+ "BFD_RELOC_ARM_MOVT",
-+ "BFD_RELOC_ARM_MOVW_PCREL",
-+ "BFD_RELOC_ARM_MOVT_PCREL",
-+ "BFD_RELOC_ARM_THUMB_MOVW",
-+ "BFD_RELOC_ARM_THUMB_MOVT",
-+ "BFD_RELOC_ARM_THUMB_MOVW_PCREL",
-+ "BFD_RELOC_ARM_THUMB_MOVT_PCREL",
-+ "BFD_RELOC_ARM_JUMP_SLOT",
-+ "BFD_RELOC_ARM_GLOB_DAT",
-+ "BFD_RELOC_ARM_GOT32",
-+ "BFD_RELOC_ARM_PLT32",
-+ "BFD_RELOC_ARM_RELATIVE",
-+ "BFD_RELOC_ARM_GOTOFF",
-+ "BFD_RELOC_ARM_GOTPC",
-+ "BFD_RELOC_ARM_TLS_GD32",
-+ "BFD_RELOC_ARM_TLS_LDO32",
-+ "BFD_RELOC_ARM_TLS_LDM32",
-+ "BFD_RELOC_ARM_TLS_DTPOFF32",
-+ "BFD_RELOC_ARM_TLS_DTPMOD32",
-+ "BFD_RELOC_ARM_TLS_TPOFF32",
-+ "BFD_RELOC_ARM_TLS_IE32",
-+ "BFD_RELOC_ARM_TLS_LE32",
-+ "BFD_RELOC_ARM_ALU_PC_G0_NC",
-+ "BFD_RELOC_ARM_ALU_PC_G0",
-+ "BFD_RELOC_ARM_ALU_PC_G1_NC",
-+ "BFD_RELOC_ARM_ALU_PC_G1",
-+ "BFD_RELOC_ARM_ALU_PC_G2",
-+ "BFD_RELOC_ARM_LDR_PC_G0",
-+ "BFD_RELOC_ARM_LDR_PC_G1",
-+ "BFD_RELOC_ARM_LDR_PC_G2",
-+ "BFD_RELOC_ARM_LDRS_PC_G0",
-+ "BFD_RELOC_ARM_LDRS_PC_G1",
-+ "BFD_RELOC_ARM_LDRS_PC_G2",
-+ "BFD_RELOC_ARM_LDC_PC_G0",
-+ "BFD_RELOC_ARM_LDC_PC_G1",
-+ "BFD_RELOC_ARM_LDC_PC_G2",
-+ "BFD_RELOC_ARM_ALU_SB_G0_NC",
-+ "BFD_RELOC_ARM_ALU_SB_G0",
-+ "BFD_RELOC_ARM_ALU_SB_G1_NC",
-+ "BFD_RELOC_ARM_ALU_SB_G1",
-+ "BFD_RELOC_ARM_ALU_SB_G2",
-+ "BFD_RELOC_ARM_LDR_SB_G0",
-+ "BFD_RELOC_ARM_LDR_SB_G1",
-+ "BFD_RELOC_ARM_LDR_SB_G2",
-+ "BFD_RELOC_ARM_LDRS_SB_G0",
-+ "BFD_RELOC_ARM_LDRS_SB_G1",
-+ "BFD_RELOC_ARM_LDRS_SB_G2",
-+ "BFD_RELOC_ARM_LDC_SB_G0",
-+ "BFD_RELOC_ARM_LDC_SB_G1",
-+ "BFD_RELOC_ARM_LDC_SB_G2",
-+ "BFD_RELOC_ARM_IMMEDIATE",
-+ "BFD_RELOC_ARM_ADRL_IMMEDIATE",
-+ "BFD_RELOC_ARM_T32_IMMEDIATE",
-+ "BFD_RELOC_ARM_T32_ADD_IMM",
-+ "BFD_RELOC_ARM_T32_IMM12",
-+ "BFD_RELOC_ARM_T32_ADD_PC12",
-+ "BFD_RELOC_ARM_SHIFT_IMM",
-+ "BFD_RELOC_ARM_SMC",
-+ "BFD_RELOC_ARM_SWI",
-+ "BFD_RELOC_ARM_MULTI",
-+ "BFD_RELOC_ARM_CP_OFF_IMM",
-+ "BFD_RELOC_ARM_CP_OFF_IMM_S2",
-+ "BFD_RELOC_ARM_T32_CP_OFF_IMM",
-+ "BFD_RELOC_ARM_T32_CP_OFF_IMM_S2",
-+ "BFD_RELOC_ARM_ADR_IMM",
-+ "BFD_RELOC_ARM_LDR_IMM",
-+ "BFD_RELOC_ARM_LITERAL",
-+ "BFD_RELOC_ARM_IN_POOL",
-+ "BFD_RELOC_ARM_OFFSET_IMM8",
-+ "BFD_RELOC_ARM_T32_OFFSET_U8",
-+ "BFD_RELOC_ARM_T32_OFFSET_IMM",
-+ "BFD_RELOC_ARM_HWLITERAL",
-+ "BFD_RELOC_ARM_THUMB_ADD",
-+ "BFD_RELOC_ARM_THUMB_IMM",
-+ "BFD_RELOC_ARM_THUMB_SHIFT",
-+ "BFD_RELOC_SH_PCDISP8BY2",
-+ "BFD_RELOC_SH_PCDISP12BY2",
-+ "BFD_RELOC_SH_IMM3",
-+ "BFD_RELOC_SH_IMM3U",
-+ "BFD_RELOC_SH_DISP12",
-+ "BFD_RELOC_SH_DISP12BY2",
-+ "BFD_RELOC_SH_DISP12BY4",
-+ "BFD_RELOC_SH_DISP12BY8",
-+ "BFD_RELOC_SH_DISP20",
-+ "BFD_RELOC_SH_DISP20BY8",
-+ "BFD_RELOC_SH_IMM4",
-+ "BFD_RELOC_SH_IMM4BY2",
-+ "BFD_RELOC_SH_IMM4BY4",
-+ "BFD_RELOC_SH_IMM8",
-+ "BFD_RELOC_SH_IMM8BY2",
-+ "BFD_RELOC_SH_IMM8BY4",
-+ "BFD_RELOC_SH_PCRELIMM8BY2",
-+ "BFD_RELOC_SH_PCRELIMM8BY4",
-+ "BFD_RELOC_SH_SWITCH16",
-+ "BFD_RELOC_SH_SWITCH32",
-+ "BFD_RELOC_SH_USES",
-+ "BFD_RELOC_SH_COUNT",
-+ "BFD_RELOC_SH_ALIGN",
-+ "BFD_RELOC_SH_CODE",
-+ "BFD_RELOC_SH_DATA",
-+ "BFD_RELOC_SH_LABEL",
-+ "BFD_RELOC_SH_LOOP_START",
-+ "BFD_RELOC_SH_LOOP_END",
-+ "BFD_RELOC_SH_COPY",
-+ "BFD_RELOC_SH_GLOB_DAT",
-+ "BFD_RELOC_SH_JMP_SLOT",
-+ "BFD_RELOC_SH_RELATIVE",
-+ "BFD_RELOC_SH_GOTPC",
-+ "BFD_RELOC_SH_GOT_LOW16",
-+ "BFD_RELOC_SH_GOT_MEDLOW16",
-+ "BFD_RELOC_SH_GOT_MEDHI16",
-+ "BFD_RELOC_SH_GOT_HI16",
-+ "BFD_RELOC_SH_GOTPLT_LOW16",
-+ "BFD_RELOC_SH_GOTPLT_MEDLOW16",
-+ "BFD_RELOC_SH_GOTPLT_MEDHI16",
-+ "BFD_RELOC_SH_GOTPLT_HI16",
-+ "BFD_RELOC_SH_PLT_LOW16",
-+ "BFD_RELOC_SH_PLT_MEDLOW16",
-+ "BFD_RELOC_SH_PLT_MEDHI16",
-+ "BFD_RELOC_SH_PLT_HI16",
-+ "BFD_RELOC_SH_GOTOFF_LOW16",
-+ "BFD_RELOC_SH_GOTOFF_MEDLOW16",
-+ "BFD_RELOC_SH_GOTOFF_MEDHI16",
-+ "BFD_RELOC_SH_GOTOFF_HI16",
-+ "BFD_RELOC_SH_GOTPC_LOW16",
-+ "BFD_RELOC_SH_GOTPC_MEDLOW16",
-+ "BFD_RELOC_SH_GOTPC_MEDHI16",
-+ "BFD_RELOC_SH_GOTPC_HI16",
-+ "BFD_RELOC_SH_COPY64",
-+ "BFD_RELOC_SH_GLOB_DAT64",
-+ "BFD_RELOC_SH_JMP_SLOT64",
-+ "BFD_RELOC_SH_RELATIVE64",
-+ "BFD_RELOC_SH_GOT10BY4",
-+ "BFD_RELOC_SH_GOT10BY8",
-+ "BFD_RELOC_SH_GOTPLT10BY4",
-+ "BFD_RELOC_SH_GOTPLT10BY8",
-+ "BFD_RELOC_SH_GOTPLT32",
-+ "BFD_RELOC_SH_SHMEDIA_CODE",
-+ "BFD_RELOC_SH_IMMU5",
-+ "BFD_RELOC_SH_IMMS6",
-+ "BFD_RELOC_SH_IMMS6BY32",
-+ "BFD_RELOC_SH_IMMU6",
-+ "BFD_RELOC_SH_IMMS10",
-+ "BFD_RELOC_SH_IMMS10BY2",
-+ "BFD_RELOC_SH_IMMS10BY4",
-+ "BFD_RELOC_SH_IMMS10BY8",
-+ "BFD_RELOC_SH_IMMS16",
-+ "BFD_RELOC_SH_IMMU16",
-+ "BFD_RELOC_SH_IMM_LOW16",
-+ "BFD_RELOC_SH_IMM_LOW16_PCREL",
-+ "BFD_RELOC_SH_IMM_MEDLOW16",
-+ "BFD_RELOC_SH_IMM_MEDLOW16_PCREL",
-+ "BFD_RELOC_SH_IMM_MEDHI16",
-+ "BFD_RELOC_SH_IMM_MEDHI16_PCREL",
-+ "BFD_RELOC_SH_IMM_HI16",
-+ "BFD_RELOC_SH_IMM_HI16_PCREL",
-+ "BFD_RELOC_SH_PT_16",
-+ "BFD_RELOC_SH_TLS_GD_32",
-+ "BFD_RELOC_SH_TLS_LD_32",
-+ "BFD_RELOC_SH_TLS_LDO_32",
-+ "BFD_RELOC_SH_TLS_IE_32",
-+ "BFD_RELOC_SH_TLS_LE_32",
-+ "BFD_RELOC_SH_TLS_DTPMOD32",
-+ "BFD_RELOC_SH_TLS_DTPOFF32",
-+ "BFD_RELOC_SH_TLS_TPOFF32",
-+ "BFD_RELOC_ARC_B22_PCREL",
-+ "BFD_RELOC_ARC_B26",
-+ "BFD_RELOC_BFIN_16_IMM",
-+ "BFD_RELOC_BFIN_16_HIGH",
-+ "BFD_RELOC_BFIN_4_PCREL",
-+ "BFD_RELOC_BFIN_5_PCREL",
-+ "BFD_RELOC_BFIN_16_LOW",
-+ "BFD_RELOC_BFIN_10_PCREL",
-+ "BFD_RELOC_BFIN_11_PCREL",
-+ "BFD_RELOC_BFIN_12_PCREL_JUMP",
-+ "BFD_RELOC_BFIN_12_PCREL_JUMP_S",
-+ "BFD_RELOC_BFIN_24_PCREL_CALL_X",
-+ "BFD_RELOC_BFIN_24_PCREL_JUMP_L",
-+ "BFD_RELOC_BFIN_GOT17M4",
-+ "BFD_RELOC_BFIN_GOTHI",
-+ "BFD_RELOC_BFIN_GOTLO",
-+ "BFD_RELOC_BFIN_FUNCDESC",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOT17M4",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOTHI",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOTLO",
-+ "BFD_RELOC_BFIN_FUNCDESC_VALUE",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI",
-+ "BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO",
-+ "BFD_RELOC_BFIN_GOTOFF17M4",
-+ "BFD_RELOC_BFIN_GOTOFFHI",
-+ "BFD_RELOC_BFIN_GOTOFFLO",
-+ "BFD_RELOC_BFIN_GOT",
-+ "BFD_RELOC_BFIN_PLTPC",
-+ "BFD_ARELOC_BFIN_PUSH",
-+ "BFD_ARELOC_BFIN_CONST",
-+ "BFD_ARELOC_BFIN_ADD",
-+ "BFD_ARELOC_BFIN_SUB",
-+ "BFD_ARELOC_BFIN_MULT",
-+ "BFD_ARELOC_BFIN_DIV",
-+ "BFD_ARELOC_BFIN_MOD",
-+ "BFD_ARELOC_BFIN_LSHIFT",
-+ "BFD_ARELOC_BFIN_RSHIFT",
-+ "BFD_ARELOC_BFIN_AND",
-+ "BFD_ARELOC_BFIN_OR",
-+ "BFD_ARELOC_BFIN_XOR",
-+ "BFD_ARELOC_BFIN_LAND",
-+ "BFD_ARELOC_BFIN_LOR",
-+ "BFD_ARELOC_BFIN_LEN",
-+ "BFD_ARELOC_BFIN_NEG",
-+ "BFD_ARELOC_BFIN_COMP",
-+ "BFD_ARELOC_BFIN_PAGE",
-+ "BFD_ARELOC_BFIN_HWPAGE",
-+ "BFD_ARELOC_BFIN_ADDR",
-+ "BFD_RELOC_D10V_10_PCREL_R",
-+ "BFD_RELOC_D10V_10_PCREL_L",
-+ "BFD_RELOC_D10V_18",
-+ "BFD_RELOC_D10V_18_PCREL",
-+ "BFD_RELOC_D30V_6",
-+ "BFD_RELOC_D30V_9_PCREL",
-+ "BFD_RELOC_D30V_9_PCREL_R",
-+ "BFD_RELOC_D30V_15",
-+ "BFD_RELOC_D30V_15_PCREL",
-+ "BFD_RELOC_D30V_15_PCREL_R",
-+ "BFD_RELOC_D30V_21",
-+ "BFD_RELOC_D30V_21_PCREL",
-+ "BFD_RELOC_D30V_21_PCREL_R",
-+ "BFD_RELOC_D30V_32",
-+ "BFD_RELOC_D30V_32_PCREL",
-+ "BFD_RELOC_DLX_HI16_S",
-+ "BFD_RELOC_DLX_LO16",
-+ "BFD_RELOC_DLX_JMP26",
-+ "BFD_RELOC_M32C_HI8",
-+ "BFD_RELOC_M32C_RL_JUMP",
-+ "BFD_RELOC_M32C_RL_1ADDR",
-+ "BFD_RELOC_M32C_RL_2ADDR",
-+ "BFD_RELOC_M32R_24",
-+ "BFD_RELOC_M32R_10_PCREL",
-+ "BFD_RELOC_M32R_18_PCREL",
-+ "BFD_RELOC_M32R_26_PCREL",
-+ "BFD_RELOC_M32R_HI16_ULO",
-+ "BFD_RELOC_M32R_HI16_SLO",
-+ "BFD_RELOC_M32R_LO16",
-+ "BFD_RELOC_M32R_SDA16",
-+ "BFD_RELOC_M32R_GOT24",
-+ "BFD_RELOC_M32R_26_PLTREL",
-+ "BFD_RELOC_M32R_COPY",
-+ "BFD_RELOC_M32R_GLOB_DAT",
-+ "BFD_RELOC_M32R_JMP_SLOT",
-+ "BFD_RELOC_M32R_RELATIVE",
-+ "BFD_RELOC_M32R_GOTOFF",
-+ "BFD_RELOC_M32R_GOTOFF_HI_ULO",
-+ "BFD_RELOC_M32R_GOTOFF_HI_SLO",
-+ "BFD_RELOC_M32R_GOTOFF_LO",
-+ "BFD_RELOC_M32R_GOTPC24",
-+ "BFD_RELOC_M32R_GOT16_HI_ULO",
-+ "BFD_RELOC_M32R_GOT16_HI_SLO",
-+ "BFD_RELOC_M32R_GOT16_LO",
-+ "BFD_RELOC_M32R_GOTPC_HI_ULO",
-+ "BFD_RELOC_M32R_GOTPC_HI_SLO",
-+ "BFD_RELOC_M32R_GOTPC_LO",
-+ "BFD_RELOC_V850_9_PCREL",
-+ "BFD_RELOC_V850_22_PCREL",
-+ "BFD_RELOC_V850_SDA_16_16_OFFSET",
-+ "BFD_RELOC_V850_SDA_15_16_OFFSET",
-+ "BFD_RELOC_V850_ZDA_16_16_OFFSET",
-+ "BFD_RELOC_V850_ZDA_15_16_OFFSET",
-+ "BFD_RELOC_V850_TDA_6_8_OFFSET",
-+ "BFD_RELOC_V850_TDA_7_8_OFFSET",
-+ "BFD_RELOC_V850_TDA_7_7_OFFSET",
-+ "BFD_RELOC_V850_TDA_16_16_OFFSET",
-+ "BFD_RELOC_V850_TDA_4_5_OFFSET",
-+ "BFD_RELOC_V850_TDA_4_4_OFFSET",
-+ "BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET",
-+ "BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET",
-+ "BFD_RELOC_V850_CALLT_6_7_OFFSET",
-+ "BFD_RELOC_V850_CALLT_16_16_OFFSET",
-+ "BFD_RELOC_V850_LONGCALL",
-+ "BFD_RELOC_V850_LONGJUMP",
-+ "BFD_RELOC_V850_ALIGN",
-+ "BFD_RELOC_V850_LO16_SPLIT_OFFSET",
-+ "BFD_RELOC_MN10300_32_PCREL",
-+ "BFD_RELOC_MN10300_16_PCREL",
-+ "BFD_RELOC_TIC30_LDP",
-+ "BFD_RELOC_TIC54X_PARTLS7",
-+ "BFD_RELOC_TIC54X_PARTMS9",
-+ "BFD_RELOC_TIC54X_23",
-+ "BFD_RELOC_TIC54X_16_OF_23",
-+ "BFD_RELOC_TIC54X_MS7_OF_23",
-+ "BFD_RELOC_FR30_48",
-+ "BFD_RELOC_FR30_20",
-+ "BFD_RELOC_FR30_6_IN_4",
-+ "BFD_RELOC_FR30_8_IN_8",
-+ "BFD_RELOC_FR30_9_IN_8",
-+ "BFD_RELOC_FR30_10_IN_8",
-+ "BFD_RELOC_FR30_9_PCREL",
-+ "BFD_RELOC_FR30_12_PCREL",
-+ "BFD_RELOC_MCORE_PCREL_IMM8BY4",
-+ "BFD_RELOC_MCORE_PCREL_IMM11BY2",
-+ "BFD_RELOC_MCORE_PCREL_IMM4BY2",
-+ "BFD_RELOC_MCORE_PCREL_32",
-+ "BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2",
-+ "BFD_RELOC_MCORE_RVA",
-+ "BFD_RELOC_MEP_8",
-+ "BFD_RELOC_MEP_16",
-+ "BFD_RELOC_MEP_32",
-+ "BFD_RELOC_MEP_PCREL8A2",
-+ "BFD_RELOC_MEP_PCREL12A2",
-+ "BFD_RELOC_MEP_PCREL17A2",
-+ "BFD_RELOC_MEP_PCREL24A2",
-+ "BFD_RELOC_MEP_PCABS24A2",
-+ "BFD_RELOC_MEP_LOW16",
-+ "BFD_RELOC_MEP_HI16U",
-+ "BFD_RELOC_MEP_HI16S",
-+ "BFD_RELOC_MEP_GPREL",
-+ "BFD_RELOC_MEP_TPREL",
-+ "BFD_RELOC_MEP_TPREL7",
-+ "BFD_RELOC_MEP_TPREL7A2",
-+ "BFD_RELOC_MEP_TPREL7A4",
-+ "BFD_RELOC_MEP_UIMM24",
-+ "BFD_RELOC_MEP_ADDR24A4",
-+ "BFD_RELOC_MEP_GNU_VTINHERIT",
-+ "BFD_RELOC_MEP_GNU_VTENTRY",
-+
-+ "BFD_RELOC_MMIX_GETA",
-+ "BFD_RELOC_MMIX_GETA_1",
-+ "BFD_RELOC_MMIX_GETA_2",
-+ "BFD_RELOC_MMIX_GETA_3",
-+ "BFD_RELOC_MMIX_CBRANCH",
-+ "BFD_RELOC_MMIX_CBRANCH_J",
-+ "BFD_RELOC_MMIX_CBRANCH_1",
-+ "BFD_RELOC_MMIX_CBRANCH_2",
-+ "BFD_RELOC_MMIX_CBRANCH_3",
-+ "BFD_RELOC_MMIX_PUSHJ",
-+ "BFD_RELOC_MMIX_PUSHJ_1",
-+ "BFD_RELOC_MMIX_PUSHJ_2",
-+ "BFD_RELOC_MMIX_PUSHJ_3",
-+ "BFD_RELOC_MMIX_PUSHJ_STUBBABLE",
-+ "BFD_RELOC_MMIX_JMP",
-+ "BFD_RELOC_MMIX_JMP_1",
-+ "BFD_RELOC_MMIX_JMP_2",
-+ "BFD_RELOC_MMIX_JMP_3",
-+ "BFD_RELOC_MMIX_ADDR19",
-+ "BFD_RELOC_MMIX_ADDR27",
-+ "BFD_RELOC_MMIX_REG_OR_BYTE",
-+ "BFD_RELOC_MMIX_REG",
-+ "BFD_RELOC_MMIX_BASE_PLUS_OFFSET",
-+ "BFD_RELOC_MMIX_LOCAL",
-+ "BFD_RELOC_AVR_7_PCREL",
-+ "BFD_RELOC_AVR_13_PCREL",
-+ "BFD_RELOC_AVR_16_PM",
-+ "BFD_RELOC_AVR_LO8_LDI",
-+ "BFD_RELOC_AVR_HI8_LDI",
-+ "BFD_RELOC_AVR_HH8_LDI",
-+ "BFD_RELOC_AVR_MS8_LDI",
-+ "BFD_RELOC_AVR_LO8_LDI_NEG",
-+ "BFD_RELOC_AVR_HI8_LDI_NEG",
-+ "BFD_RELOC_AVR_HH8_LDI_NEG",
-+ "BFD_RELOC_AVR_MS8_LDI_NEG",
-+ "BFD_RELOC_AVR_LO8_LDI_PM",
-+ "BFD_RELOC_AVR_LO8_LDI_GS",
-+ "BFD_RELOC_AVR_HI8_LDI_PM",
-+ "BFD_RELOC_AVR_HI8_LDI_GS",
-+ "BFD_RELOC_AVR_HH8_LDI_PM",
-+ "BFD_RELOC_AVR_LO8_LDI_PM_NEG",
-+ "BFD_RELOC_AVR_HI8_LDI_PM_NEG",
-+ "BFD_RELOC_AVR_HH8_LDI_PM_NEG",
-+ "BFD_RELOC_AVR_CALL",
-+ "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_390_12",
-+ "BFD_RELOC_390_GOT12",
-+ "BFD_RELOC_390_PLT32",
-+ "BFD_RELOC_390_COPY",
-+ "BFD_RELOC_390_GLOB_DAT",
-+ "BFD_RELOC_390_JMP_SLOT",
-+ "BFD_RELOC_390_RELATIVE",
-+ "BFD_RELOC_390_GOTPC",
-+ "BFD_RELOC_390_GOT16",
-+ "BFD_RELOC_390_PC16DBL",
-+ "BFD_RELOC_390_PLT16DBL",
-+ "BFD_RELOC_390_PC32DBL",
-+ "BFD_RELOC_390_PLT32DBL",
-+ "BFD_RELOC_390_GOTPCDBL",
-+ "BFD_RELOC_390_GOT64",
-+ "BFD_RELOC_390_PLT64",
-+ "BFD_RELOC_390_GOTENT",
-+ "BFD_RELOC_390_GOTOFF64",
-+ "BFD_RELOC_390_GOTPLT12",
-+ "BFD_RELOC_390_GOTPLT16",
-+ "BFD_RELOC_390_GOTPLT32",
-+ "BFD_RELOC_390_GOTPLT64",
-+ "BFD_RELOC_390_GOTPLTENT",
-+ "BFD_RELOC_390_PLTOFF16",
-+ "BFD_RELOC_390_PLTOFF32",
-+ "BFD_RELOC_390_PLTOFF64",
-+ "BFD_RELOC_390_TLS_LOAD",
-+ "BFD_RELOC_390_TLS_GDCALL",
-+ "BFD_RELOC_390_TLS_LDCALL",
-+ "BFD_RELOC_390_TLS_GD32",
-+ "BFD_RELOC_390_TLS_GD64",
-+ "BFD_RELOC_390_TLS_GOTIE12",
-+ "BFD_RELOC_390_TLS_GOTIE32",
-+ "BFD_RELOC_390_TLS_GOTIE64",
-+ "BFD_RELOC_390_TLS_LDM32",
-+ "BFD_RELOC_390_TLS_LDM64",
-+ "BFD_RELOC_390_TLS_IE32",
-+ "BFD_RELOC_390_TLS_IE64",
-+ "BFD_RELOC_390_TLS_IEENT",
-+ "BFD_RELOC_390_TLS_LE32",
-+ "BFD_RELOC_390_TLS_LE64",
-+ "BFD_RELOC_390_TLS_LDO32",
-+ "BFD_RELOC_390_TLS_LDO64",
-+ "BFD_RELOC_390_TLS_DTPMOD",
-+ "BFD_RELOC_390_TLS_DTPOFF",
-+ "BFD_RELOC_390_TLS_TPOFF",
-+ "BFD_RELOC_390_20",
-+ "BFD_RELOC_390_GOT20",
-+ "BFD_RELOC_390_GOTPLT20",
-+ "BFD_RELOC_390_TLS_GOTIE20",
-+ "BFD_RELOC_SCORE_DUMMY1",
-+ "BFD_RELOC_SCORE_GPREL15",
-+ "BFD_RELOC_SCORE_DUMMY2",
-+ "BFD_RELOC_SCORE_JMP",
-+ "BFD_RELOC_SCORE_BRANCH",
-+ "BFD_RELOC_SCORE16_JMP",
-+ "BFD_RELOC_SCORE16_BRANCH",
-+ "BFD_RELOC_SCORE_GOT15",
-+ "BFD_RELOC_SCORE_GOT_LO16",
-+ "BFD_RELOC_SCORE_CALL15",
-+ "BFD_RELOC_SCORE_DUMMY_HI16",
-+ "BFD_RELOC_IP2K_FR9",
-+ "BFD_RELOC_IP2K_BANK",
-+ "BFD_RELOC_IP2K_ADDR16CJP",
-+ "BFD_RELOC_IP2K_PAGE3",
-+ "BFD_RELOC_IP2K_LO8DATA",
-+ "BFD_RELOC_IP2K_HI8DATA",
-+ "BFD_RELOC_IP2K_EX8DATA",
-+ "BFD_RELOC_IP2K_LO8INSN",
-+ "BFD_RELOC_IP2K_HI8INSN",
-+ "BFD_RELOC_IP2K_PC_SKIP",
-+ "BFD_RELOC_IP2K_TEXT",
-+ "BFD_RELOC_IP2K_FR_OFFSET",
-+ "BFD_RELOC_VPE4KMATH_DATA",
-+ "BFD_RELOC_VPE4KMATH_INSN",
-+ "BFD_RELOC_VTABLE_INHERIT",
-+ "BFD_RELOC_VTABLE_ENTRY",
-+ "BFD_RELOC_IA64_IMM14",
-+ "BFD_RELOC_IA64_IMM22",
-+ "BFD_RELOC_IA64_IMM64",
-+ "BFD_RELOC_IA64_DIR32MSB",
-+ "BFD_RELOC_IA64_DIR32LSB",
-+ "BFD_RELOC_IA64_DIR64MSB",
-+ "BFD_RELOC_IA64_DIR64LSB",
-+ "BFD_RELOC_IA64_GPREL22",
-+ "BFD_RELOC_IA64_GPREL64I",
-+ "BFD_RELOC_IA64_GPREL32MSB",
-+ "BFD_RELOC_IA64_GPREL32LSB",
-+ "BFD_RELOC_IA64_GPREL64MSB",
-+ "BFD_RELOC_IA64_GPREL64LSB",
-+ "BFD_RELOC_IA64_LTOFF22",
-+ "BFD_RELOC_IA64_LTOFF64I",
-+ "BFD_RELOC_IA64_PLTOFF22",
-+ "BFD_RELOC_IA64_PLTOFF64I",
-+ "BFD_RELOC_IA64_PLTOFF64MSB",
-+ "BFD_RELOC_IA64_PLTOFF64LSB",
-+ "BFD_RELOC_IA64_FPTR64I",
-+ "BFD_RELOC_IA64_FPTR32MSB",
-+ "BFD_RELOC_IA64_FPTR32LSB",
-+ "BFD_RELOC_IA64_FPTR64MSB",
-+ "BFD_RELOC_IA64_FPTR64LSB",
-+ "BFD_RELOC_IA64_PCREL21B",
-+ "BFD_RELOC_IA64_PCREL21BI",
-+ "BFD_RELOC_IA64_PCREL21M",
-+ "BFD_RELOC_IA64_PCREL21F",
-+ "BFD_RELOC_IA64_PCREL22",
-+ "BFD_RELOC_IA64_PCREL60B",
-+ "BFD_RELOC_IA64_PCREL64I",
-+ "BFD_RELOC_IA64_PCREL32MSB",
-+ "BFD_RELOC_IA64_PCREL32LSB",
-+ "BFD_RELOC_IA64_PCREL64MSB",
-+ "BFD_RELOC_IA64_PCREL64LSB",
-+ "BFD_RELOC_IA64_LTOFF_FPTR22",
-+ "BFD_RELOC_IA64_LTOFF_FPTR64I",
-+ "BFD_RELOC_IA64_LTOFF_FPTR32MSB",
-+ "BFD_RELOC_IA64_LTOFF_FPTR32LSB",
-+ "BFD_RELOC_IA64_LTOFF_FPTR64MSB",
-+ "BFD_RELOC_IA64_LTOFF_FPTR64LSB",
-+ "BFD_RELOC_IA64_SEGREL32MSB",
-+ "BFD_RELOC_IA64_SEGREL32LSB",
-+ "BFD_RELOC_IA64_SEGREL64MSB",
-+ "BFD_RELOC_IA64_SEGREL64LSB",
-+ "BFD_RELOC_IA64_SECREL32MSB",
-+ "BFD_RELOC_IA64_SECREL32LSB",
-+ "BFD_RELOC_IA64_SECREL64MSB",
-+ "BFD_RELOC_IA64_SECREL64LSB",
-+ "BFD_RELOC_IA64_REL32MSB",
-+ "BFD_RELOC_IA64_REL32LSB",
-+ "BFD_RELOC_IA64_REL64MSB",
-+ "BFD_RELOC_IA64_REL64LSB",
-+ "BFD_RELOC_IA64_LTV32MSB",
-+ "BFD_RELOC_IA64_LTV32LSB",
-+ "BFD_RELOC_IA64_LTV64MSB",
-+ "BFD_RELOC_IA64_LTV64LSB",
-+ "BFD_RELOC_IA64_IPLTMSB",
-+ "BFD_RELOC_IA64_IPLTLSB",
-+ "BFD_RELOC_IA64_COPY",
-+ "BFD_RELOC_IA64_LTOFF22X",
-+ "BFD_RELOC_IA64_LDXMOV",
-+ "BFD_RELOC_IA64_TPREL14",
-+ "BFD_RELOC_IA64_TPREL22",
-+ "BFD_RELOC_IA64_TPREL64I",
-+ "BFD_RELOC_IA64_TPREL64MSB",
-+ "BFD_RELOC_IA64_TPREL64LSB",
-+ "BFD_RELOC_IA64_LTOFF_TPREL22",
-+ "BFD_RELOC_IA64_DTPMOD64MSB",
-+ "BFD_RELOC_IA64_DTPMOD64LSB",
-+ "BFD_RELOC_IA64_LTOFF_DTPMOD22",
-+ "BFD_RELOC_IA64_DTPREL14",
-+ "BFD_RELOC_IA64_DTPREL22",
-+ "BFD_RELOC_IA64_DTPREL64I",
-+ "BFD_RELOC_IA64_DTPREL32MSB",
-+ "BFD_RELOC_IA64_DTPREL32LSB",
-+ "BFD_RELOC_IA64_DTPREL64MSB",
-+ "BFD_RELOC_IA64_DTPREL64LSB",
-+ "BFD_RELOC_IA64_LTOFF_DTPREL22",
-+ "BFD_RELOC_M68HC11_HI8",
-+ "BFD_RELOC_M68HC11_LO8",
-+ "BFD_RELOC_M68HC11_3B",
-+ "BFD_RELOC_M68HC11_RL_JUMP",
-+ "BFD_RELOC_M68HC11_RL_GROUP",
-+ "BFD_RELOC_M68HC11_LO16",
-+ "BFD_RELOC_M68HC11_PAGE",
-+ "BFD_RELOC_M68HC11_24",
-+ "BFD_RELOC_M68HC12_5B",
-+ "BFD_RELOC_16C_NUM08",
-+ "BFD_RELOC_16C_NUM08_C",
-+ "BFD_RELOC_16C_NUM16",
-+ "BFD_RELOC_16C_NUM16_C",
-+ "BFD_RELOC_16C_NUM32",
-+ "BFD_RELOC_16C_NUM32_C",
-+ "BFD_RELOC_16C_DISP04",
-+ "BFD_RELOC_16C_DISP04_C",
-+ "BFD_RELOC_16C_DISP08",
-+ "BFD_RELOC_16C_DISP08_C",
-+ "BFD_RELOC_16C_DISP16",
-+ "BFD_RELOC_16C_DISP16_C",
-+ "BFD_RELOC_16C_DISP24",
-+ "BFD_RELOC_16C_DISP24_C",
-+ "BFD_RELOC_16C_DISP24a",
-+ "BFD_RELOC_16C_DISP24a_C",
-+ "BFD_RELOC_16C_REG04",
-+ "BFD_RELOC_16C_REG04_C",
-+ "BFD_RELOC_16C_REG04a",
-+ "BFD_RELOC_16C_REG04a_C",
-+ "BFD_RELOC_16C_REG14",
-+ "BFD_RELOC_16C_REG14_C",
-+ "BFD_RELOC_16C_REG16",
-+ "BFD_RELOC_16C_REG16_C",
-+ "BFD_RELOC_16C_REG20",
-+ "BFD_RELOC_16C_REG20_C",
-+ "BFD_RELOC_16C_ABS20",
-+ "BFD_RELOC_16C_ABS20_C",
-+ "BFD_RELOC_16C_ABS24",
-+ "BFD_RELOC_16C_ABS24_C",
-+ "BFD_RELOC_16C_IMM04",
-+ "BFD_RELOC_16C_IMM04_C",
-+ "BFD_RELOC_16C_IMM16",
-+ "BFD_RELOC_16C_IMM16_C",
-+ "BFD_RELOC_16C_IMM20",
-+ "BFD_RELOC_16C_IMM20_C",
-+ "BFD_RELOC_16C_IMM24",
-+ "BFD_RELOC_16C_IMM24_C",
-+ "BFD_RELOC_16C_IMM32",
-+ "BFD_RELOC_16C_IMM32_C",
-+ "BFD_RELOC_CR16_NUM8",
-+ "BFD_RELOC_CR16_NUM16",
-+ "BFD_RELOC_CR16_NUM32",
-+ "BFD_RELOC_CR16_NUM32a",
-+ "BFD_RELOC_CR16_REGREL0",
-+ "BFD_RELOC_CR16_REGREL4",
-+ "BFD_RELOC_CR16_REGREL4a",
-+ "BFD_RELOC_CR16_REGREL14",
-+ "BFD_RELOC_CR16_REGREL14a",
-+ "BFD_RELOC_CR16_REGREL16",
-+ "BFD_RELOC_CR16_REGREL20",
-+ "BFD_RELOC_CR16_REGREL20a",
-+ "BFD_RELOC_CR16_ABS20",
-+ "BFD_RELOC_CR16_ABS24",
-+ "BFD_RELOC_CR16_IMM4",
-+ "BFD_RELOC_CR16_IMM8",
-+ "BFD_RELOC_CR16_IMM16",
-+ "BFD_RELOC_CR16_IMM20",
-+ "BFD_RELOC_CR16_IMM24",
-+ "BFD_RELOC_CR16_IMM32",
-+ "BFD_RELOC_CR16_IMM32a",
-+ "BFD_RELOC_CR16_DISP4",
-+ "BFD_RELOC_CR16_DISP8",
-+ "BFD_RELOC_CR16_DISP16",
-+ "BFD_RELOC_CR16_DISP20",
-+ "BFD_RELOC_CR16_DISP24",
-+ "BFD_RELOC_CR16_DISP24a",
-+ "BFD_RELOC_CRX_REL4",
-+ "BFD_RELOC_CRX_REL8",
-+ "BFD_RELOC_CRX_REL8_CMP",
-+ "BFD_RELOC_CRX_REL16",
-+ "BFD_RELOC_CRX_REL24",
-+ "BFD_RELOC_CRX_REL32",
-+ "BFD_RELOC_CRX_REGREL12",
-+ "BFD_RELOC_CRX_REGREL22",
-+ "BFD_RELOC_CRX_REGREL28",
-+ "BFD_RELOC_CRX_REGREL32",
-+ "BFD_RELOC_CRX_ABS16",
-+ "BFD_RELOC_CRX_ABS32",
-+ "BFD_RELOC_CRX_NUM8",
-+ "BFD_RELOC_CRX_NUM16",
-+ "BFD_RELOC_CRX_NUM32",
-+ "BFD_RELOC_CRX_IMM16",
-+ "BFD_RELOC_CRX_IMM32",
-+ "BFD_RELOC_CRX_SWITCH8",
-+ "BFD_RELOC_CRX_SWITCH16",
-+ "BFD_RELOC_CRX_SWITCH32",
-+ "BFD_RELOC_CRIS_BDISP8",
-+ "BFD_RELOC_CRIS_UNSIGNED_5",
-+ "BFD_RELOC_CRIS_SIGNED_6",
-+ "BFD_RELOC_CRIS_UNSIGNED_6",
-+ "BFD_RELOC_CRIS_SIGNED_8",
-+ "BFD_RELOC_CRIS_UNSIGNED_8",
-+ "BFD_RELOC_CRIS_SIGNED_16",
-+ "BFD_RELOC_CRIS_UNSIGNED_16",
-+ "BFD_RELOC_CRIS_LAPCQ_OFFSET",
-+ "BFD_RELOC_CRIS_UNSIGNED_4",
-+ "BFD_RELOC_CRIS_COPY",
-+ "BFD_RELOC_CRIS_GLOB_DAT",
-+ "BFD_RELOC_CRIS_JUMP_SLOT",
-+ "BFD_RELOC_CRIS_RELATIVE",
-+ "BFD_RELOC_CRIS_32_GOT",
-+ "BFD_RELOC_CRIS_16_GOT",
-+ "BFD_RELOC_CRIS_32_GOTPLT",
-+ "BFD_RELOC_CRIS_16_GOTPLT",
-+ "BFD_RELOC_CRIS_32_GOTREL",
-+ "BFD_RELOC_CRIS_32_PLT_GOTREL",
-+ "BFD_RELOC_CRIS_32_PLT_PCREL",
-+ "BFD_RELOC_860_COPY",
-+ "BFD_RELOC_860_GLOB_DAT",
-+ "BFD_RELOC_860_JUMP_SLOT",
-+ "BFD_RELOC_860_RELATIVE",
-+ "BFD_RELOC_860_PC26",
-+ "BFD_RELOC_860_PLT26",
-+ "BFD_RELOC_860_PC16",
-+ "BFD_RELOC_860_LOW0",
-+ "BFD_RELOC_860_SPLIT0",
-+ "BFD_RELOC_860_LOW1",
-+ "BFD_RELOC_860_SPLIT1",
-+ "BFD_RELOC_860_LOW2",
-+ "BFD_RELOC_860_SPLIT2",
-+ "BFD_RELOC_860_LOW3",
-+ "BFD_RELOC_860_LOGOT0",
-+ "BFD_RELOC_860_SPGOT0",
-+ "BFD_RELOC_860_LOGOT1",
-+ "BFD_RELOC_860_SPGOT1",
-+ "BFD_RELOC_860_LOGOTOFF0",
-+ "BFD_RELOC_860_SPGOTOFF0",
-+ "BFD_RELOC_860_LOGOTOFF1",
-+ "BFD_RELOC_860_SPGOTOFF1",
-+ "BFD_RELOC_860_LOGOTOFF2",
-+ "BFD_RELOC_860_LOGOTOFF3",
-+ "BFD_RELOC_860_LOPC",
-+ "BFD_RELOC_860_HIGHADJ",
-+ "BFD_RELOC_860_HAGOT",
-+ "BFD_RELOC_860_HAGOTOFF",
-+ "BFD_RELOC_860_HAPC",
-+ "BFD_RELOC_860_HIGH",
-+ "BFD_RELOC_860_HIGOT",
-+ "BFD_RELOC_860_HIGOTOFF",
-+ "BFD_RELOC_OPENRISC_ABS_26",
-+ "BFD_RELOC_OPENRISC_REL_26",
-+ "BFD_RELOC_H8_DIR16A8",
-+ "BFD_RELOC_H8_DIR16R8",
-+ "BFD_RELOC_H8_DIR24A8",
-+ "BFD_RELOC_H8_DIR24R8",
-+ "BFD_RELOC_H8_DIR32A16",
-+ "BFD_RELOC_XSTORMY16_REL_12",
-+ "BFD_RELOC_XSTORMY16_12",
-+ "BFD_RELOC_XSTORMY16_24",
-+ "BFD_RELOC_XSTORMY16_FPTR16",
-+ "BFD_RELOC_RELC",
-+
-+ "BFD_RELOC_XC16X_PAG",
-+ "BFD_RELOC_XC16X_POF",
-+ "BFD_RELOC_XC16X_SEG",
-+ "BFD_RELOC_XC16X_SOF",
-+ "BFD_RELOC_VAX_GLOB_DAT",
-+ "BFD_RELOC_VAX_JMP_SLOT",
-+ "BFD_RELOC_VAX_RELATIVE",
-+ "BFD_RELOC_MT_PC16",
-+ "BFD_RELOC_MT_HI16",
-+ "BFD_RELOC_MT_LO16",
-+ "BFD_RELOC_MT_GNU_VTINHERIT",
-+ "BFD_RELOC_MT_GNU_VTENTRY",
-+ "BFD_RELOC_MT_PCINSN8",
-+ "BFD_RELOC_MSP430_10_PCREL",
-+ "BFD_RELOC_MSP430_16_PCREL",
-+ "BFD_RELOC_MSP430_16",
-+ "BFD_RELOC_MSP430_16_PCREL_BYTE",
-+ "BFD_RELOC_MSP430_16_BYTE",
-+ "BFD_RELOC_MSP430_2X_PCREL",
-+ "BFD_RELOC_MSP430_RL_PCREL",
-+ "BFD_RELOC_IQ2000_OFFSET_16",
-+ "BFD_RELOC_IQ2000_OFFSET_21",
-+ "BFD_RELOC_IQ2000_UHI16",
-+ "BFD_RELOC_XTENSA_RTLD",
-+ "BFD_RELOC_XTENSA_GLOB_DAT",
-+ "BFD_RELOC_XTENSA_JMP_SLOT",
-+ "BFD_RELOC_XTENSA_RELATIVE",
-+ "BFD_RELOC_XTENSA_PLT",
-+ "BFD_RELOC_XTENSA_DIFF8",
-+ "BFD_RELOC_XTENSA_DIFF16",
-+ "BFD_RELOC_XTENSA_DIFF32",
-+ "BFD_RELOC_XTENSA_SLOT0_OP",
-+ "BFD_RELOC_XTENSA_SLOT1_OP",
-+ "BFD_RELOC_XTENSA_SLOT2_OP",
-+ "BFD_RELOC_XTENSA_SLOT3_OP",
-+ "BFD_RELOC_XTENSA_SLOT4_OP",
-+ "BFD_RELOC_XTENSA_SLOT5_OP",
-+ "BFD_RELOC_XTENSA_SLOT6_OP",
-+ "BFD_RELOC_XTENSA_SLOT7_OP",
-+ "BFD_RELOC_XTENSA_SLOT8_OP",
-+ "BFD_RELOC_XTENSA_SLOT9_OP",
-+ "BFD_RELOC_XTENSA_SLOT10_OP",
-+ "BFD_RELOC_XTENSA_SLOT11_OP",
-+ "BFD_RELOC_XTENSA_SLOT12_OP",
-+ "BFD_RELOC_XTENSA_SLOT13_OP",
-+ "BFD_RELOC_XTENSA_SLOT14_OP",
-+ "BFD_RELOC_XTENSA_SLOT0_ALT",
-+ "BFD_RELOC_XTENSA_SLOT1_ALT",
-+ "BFD_RELOC_XTENSA_SLOT2_ALT",
-+ "BFD_RELOC_XTENSA_SLOT3_ALT",
-+ "BFD_RELOC_XTENSA_SLOT4_ALT",
-+ "BFD_RELOC_XTENSA_SLOT5_ALT",
-+ "BFD_RELOC_XTENSA_SLOT6_ALT",
-+ "BFD_RELOC_XTENSA_SLOT7_ALT",
-+ "BFD_RELOC_XTENSA_SLOT8_ALT",
-+ "BFD_RELOC_XTENSA_SLOT9_ALT",
-+ "BFD_RELOC_XTENSA_SLOT10_ALT",
-+ "BFD_RELOC_XTENSA_SLOT11_ALT",
-+ "BFD_RELOC_XTENSA_SLOT12_ALT",
-+ "BFD_RELOC_XTENSA_SLOT13_ALT",
-+ "BFD_RELOC_XTENSA_SLOT14_ALT",
-+ "BFD_RELOC_XTENSA_OP0",
-+ "BFD_RELOC_XTENSA_OP1",
-+ "BFD_RELOC_XTENSA_OP2",
-+ "BFD_RELOC_XTENSA_ASM_EXPAND",
-+ "BFD_RELOC_XTENSA_ASM_SIMPLIFY",
-+ "BFD_RELOC_Z80_DISP8",
-+ "BFD_RELOC_Z8K_DISP7",
-+ "BFD_RELOC_Z8K_CALLR",
-+ "BFD_RELOC_Z8K_IMM4L",
-+ "@@overflow: BFD_RELOC_UNUSED@@",
-+};
-+#endif
-+
-+reloc_howto_type *bfd_default_reloc_type_lookup
-+ (bfd *abfd, bfd_reloc_code_real_type code);
-+
-+bfd_boolean bfd_generic_relax_section
-+ (bfd *abfd,
-+ asection *section,
-+ struct bfd_link_info *,
-+ bfd_boolean *);
-+
-+bfd_boolean bfd_generic_gc_sections
-+ (bfd *, struct bfd_link_info *);
-+
-+bfd_boolean bfd_generic_merge_sections
-+ (bfd *, struct bfd_link_info *);
-+
-+bfd_byte *bfd_generic_get_relocated_section_contents
-+ (bfd *abfd,
-+ struct bfd_link_info *link_info,
-+ struct bfd_link_order *link_order,
-+ bfd_byte *data,
-+ bfd_boolean relocatable,
-+ asymbol **symbols);
-+
-+/* Extracted from archures.c. */
-+extern const bfd_arch_info_type bfd_default_arch_struct;
-+bfd_boolean bfd_default_set_arch_mach
-+ (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
-+
-+const bfd_arch_info_type *bfd_default_compatible
-+ (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
-+
-+bfd_boolean bfd_default_scan
-+ (const struct bfd_arch_info *info, const char *string);
-+
-+/* Extracted from elf.c. */
-+struct elf_internal_shdr *bfd_elf_find_section (bfd *abfd, char *name);
-+
---- /dev/null
-+++ b/bfd/doc/libcoff.h
-@@ -0,0 +1,936 @@
-+/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
-+ generated from "libcoff-in.h" and "coffcode.h".
-+ Run "make headers" in your build bfd/ to regenerate. */
-+
-+/* BFD COFF object file private structure.
-+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+ Free Software Foundation, Inc.
-+ Written by Cygnus Support.
-+
-+ 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 3 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. */
-+
-+#include "bfdlink.h"
-+
-+/* Object file tdata; access macros. */
-+
-+#define coff_data(bfd) ((bfd)->tdata.coff_obj_data)
-+#define exec_hdr(bfd) (coff_data (bfd)->hdr)
-+#define obj_pe(bfd) (coff_data (bfd)->pe)
-+#define obj_symbols(bfd) (coff_data (bfd)->symbols)
-+#define obj_sym_filepos(bfd) (coff_data (bfd)->sym_filepos)
-+#define obj_relocbase(bfd) (coff_data (bfd)->relocbase)
-+#define obj_raw_syments(bfd) (coff_data (bfd)->raw_syments)
-+#define obj_raw_syment_count(bfd) (coff_data (bfd)->raw_syment_count)
-+#define obj_convert(bfd) (coff_data (bfd)->conversion_table)
-+#define obj_conv_table_size(bfd) (coff_data (bfd)->conv_table_size)
-+#define obj_coff_external_syms(bfd) (coff_data (bfd)->external_syms)
-+#define obj_coff_keep_syms(bfd) (coff_data (bfd)->keep_syms)
-+#define obj_coff_strings(bfd) (coff_data (bfd)->strings)
-+#define obj_coff_keep_strings(bfd) (coff_data (bfd)->keep_strings)
-+#define obj_coff_sym_hashes(bfd) (coff_data (bfd)->sym_hashes)
-+#define obj_coff_strings_written(bfd) (coff_data (bfd)->strings_written)
-+#define obj_coff_local_toc_table(bfd) (coff_data (bfd)->local_toc_sym_map)
-+
-+/* `Tdata' information kept for COFF files. */
-+
-+typedef struct coff_tdata
-+{
-+ struct coff_symbol_struct *symbols; /* Symtab for input bfd. */
-+ unsigned int *conversion_table;
-+ int conv_table_size;
-+ file_ptr sym_filepos;
-+
-+ struct coff_ptr_struct *raw_syments;
-+ unsigned long raw_syment_count;
-+
-+ /* These are only valid once writing has begun. */
-+ long int relocbase;
-+
-+ /* These members communicate important constants about the symbol table
-+ to GDB's symbol-reading code. These `constants' unfortunately vary
-+ from coff implementation to implementation... */
-+ unsigned local_n_btmask;
-+ unsigned local_n_btshft;
-+ unsigned local_n_tmask;
-+ unsigned local_n_tshift;
-+ unsigned local_symesz;
-+ unsigned local_auxesz;
-+ unsigned local_linesz;
-+
-+ /* The unswapped external symbols. May be NULL. Read by
-+ _bfd_coff_get_external_symbols. */
-+ void * external_syms;
-+ /* If this is TRUE, the external_syms may not be freed. */
-+ bfd_boolean keep_syms;
-+
-+ /* The string table. May be NULL. Read by
-+ _bfd_coff_read_string_table. */
-+ char *strings;
-+ /* If this is TRUE, the strings may not be freed. */
-+ bfd_boolean keep_strings;
-+ /* If this is TRUE, the strings have been written out already. */
-+ bfd_boolean strings_written;
-+
-+ /* Is this a PE format coff file? */
-+ int pe;
-+ /* Used by the COFF backend linker. */
-+ struct coff_link_hash_entry **sym_hashes;
-+
-+ /* Used by the pe linker for PowerPC. */
-+ int *local_toc_sym_map;
-+
-+ struct bfd_link_info *link_info;
-+
-+ /* Used by coff_find_nearest_line. */
-+ void * line_info;
-+
-+ /* A place to stash dwarf2 info for this bfd. */
-+ void * dwarf2_find_line_info;
-+
-+ /* The timestamp from the COFF file header. */
-+ long timestamp;
-+
-+ /* Copy of some of the f_flags bits in the COFF filehdr structure,
-+ used by ARM code. */
-+ flagword flags;
-+
-+} coff_data_type;
-+
-+/* Tdata for pe image files. */
-+typedef struct pe_tdata
-+{
-+ coff_data_type coff;
-+ struct internal_extra_pe_aouthdr pe_opthdr;
-+ int dll;
-+ int has_reloc_section;
-+ bfd_boolean (*in_reloc_p) (bfd *, reloc_howto_type *);
-+ flagword real_flags;
-+ int target_subsystem;
-+ bfd_boolean force_minimum_alignment;
-+} pe_data_type;
-+
-+#define pe_data(bfd) ((bfd)->tdata.pe_obj_data)
-+
-+/* Tdata for XCOFF files. */
-+
-+struct xcoff_tdata
-+{
-+ /* Basic COFF information. */
-+ coff_data_type coff;
-+
-+ /* TRUE if this is an XCOFF64 file. */
-+ bfd_boolean xcoff64;
-+
-+ /* TRUE if a large a.out header should be generated. */
-+ bfd_boolean full_aouthdr;
-+
-+ /* TOC value. */
-+ bfd_vma toc;
-+
-+ /* Index of section holding TOC. */
-+ int sntoc;
-+
-+ /* Index of section holding entry point. */
-+ int snentry;
-+
-+ /* .text alignment from optional header. */
-+ int text_align_power;
-+
-+ /* .data alignment from optional header. */
-+ int data_align_power;
-+
-+ /* modtype from optional header. */
-+ short modtype;
-+
-+ /* cputype from optional header. */
-+ short cputype;
-+
-+ /* maxdata from optional header. */
-+ bfd_vma maxdata;
-+
-+ /* maxstack from optional header. */
-+ bfd_vma maxstack;
-+
-+ /* Used by the XCOFF backend linker. */
-+ asection **csects;
-+ unsigned long *debug_indices;
-+ unsigned int import_file_id;
-+};
-+
-+#define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
-+
-+/* We take the address of the first element of an asymbol to ensure that the
-+ macro is only ever applied to an asymbol. */
-+#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
-+
-+/* The used_by_bfd field of a section may be set to a pointer to this
-+ structure. */
-+
-+struct coff_section_tdata
-+{
-+ /* The relocs, swapped into COFF internal form. This may be NULL. */
-+ struct internal_reloc *relocs;
-+ /* If this is TRUE, the relocs entry may not be freed. */
-+ bfd_boolean keep_relocs;
-+ /* The section contents. This may be NULL. */
-+ bfd_byte *contents;
-+ /* If this is TRUE, the contents entry may not be freed. */
-+ bfd_boolean keep_contents;
-+ /* Information cached by coff_find_nearest_line. */
-+ bfd_vma offset;
-+ unsigned int i;
-+ const char *function;
-+ /* Optional information about a COMDAT entry; NULL if not COMDAT. */
-+ struct coff_comdat_info *comdat;
-+ int line_base;
-+ /* A pointer used for .stab linking optimizations. */
-+ void * stab_info;
-+ /* Available for individual backends. */
-+ void * tdata;
-+};
-+
-+/* An accessor macro for the coff_section_tdata structure. */
-+#define coff_section_data(abfd, sec) \
-+ ((struct coff_section_tdata *) (sec)->used_by_bfd)
-+
-+/* Tdata for sections in XCOFF files. This is used by the linker. */
-+
-+struct xcoff_section_tdata
-+{
-+ /* Used for XCOFF csects created by the linker; points to the real
-+ XCOFF section which contains this csect. */
-+ asection *enclosing;
-+ /* The lineno_count field for the enclosing section, because we are
-+ going to clobber it there. */
-+ unsigned int lineno_count;
-+ /* The first and one past the last symbol indices for symbols used
-+ by this csect. */
-+ unsigned long first_symndx;
-+ unsigned long last_symndx;
-+};
-+
-+/* An accessor macro the xcoff_section_tdata structure. */
-+#define xcoff_section_data(abfd, sec) \
-+ ((struct xcoff_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-+
-+/* Tdata for sections in PE files. */
-+
-+struct pei_section_tdata
-+{
-+ /* The virtual size of the section. */
-+ bfd_size_type virt_size;
-+ /* The PE section flags. */
-+ long pe_flags;
-+};
-+
-+/* An accessor macro for the pei_section_tdata structure. */
-+#define pei_section_data(abfd, sec) \
-+ ((struct pei_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-+
-+/* COFF linker hash table entries. */
-+
-+struct coff_link_hash_entry
-+{
-+ struct bfd_link_hash_entry root;
-+
-+ /* Symbol index in output file. Set to -1 initially. Set to -2 if
-+ there is a reloc against this symbol. */
-+ long indx;
-+
-+ /* Symbol type. */
-+ unsigned short type;
-+
-+ /* Symbol class. */
-+ unsigned char class;
-+
-+ /* Number of auxiliary entries. */
-+ char numaux;
-+
-+ /* BFD to take auxiliary entries from. */
-+ bfd *auxbfd;
-+
-+ /* Pointer to array of auxiliary entries, if any. */
-+ union internal_auxent *aux;
-+
-+ /* Flag word; legal values follow. */
-+ unsigned short coff_link_hash_flags;
-+ /* Symbol is a PE section symbol. */
-+#define COFF_LINK_HASH_PE_SECTION_SYMBOL (01)
-+};
-+
-+/* COFF linker hash table. */
-+
-+struct coff_link_hash_table
-+{
-+ struct bfd_link_hash_table root;
-+ /* A pointer to information used to link stabs in sections. */
-+ struct stab_info stab_info;
-+};
-+
-+/* Look up an entry in a COFF linker hash table. */
-+
-+#define coff_link_hash_lookup(table, string, create, copy, follow) \
-+ ((struct coff_link_hash_entry *) \
-+ bfd_link_hash_lookup (&(table)->root, (string), (create), \
-+ (copy), (follow)))
-+
-+/* Traverse a COFF linker hash table. */
-+
-+#define coff_link_hash_traverse(table, func, info) \
-+ (bfd_link_hash_traverse \
-+ (&(table)->root, \
-+ (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func), \
-+ (info)))
-+
-+/* Get the COFF linker hash table from a link_info structure. */
-+
-+#define coff_hash_table(p) ((struct coff_link_hash_table *) ((p)->hash))
-+
-+/* Functions in coffgen.c. */
-+extern const bfd_target *coff_object_p
-+ (bfd *);
-+extern struct bfd_section *coff_section_from_bfd_index
-+ (bfd *, int);
-+extern long coff_get_symtab_upper_bound
-+ (bfd *);
-+extern long coff_canonicalize_symtab
-+ (bfd *, asymbol **);
-+extern int coff_count_linenumbers
-+ (bfd *);
-+extern struct coff_symbol_struct *coff_symbol_from
-+ (bfd *, asymbol *);
-+extern bfd_boolean coff_renumber_symbols
-+ (bfd *, int *);
-+extern void coff_mangle_symbols
-+ (bfd *);
-+extern bfd_boolean coff_write_symbols
-+ (bfd *);
-+extern bfd_boolean coff_write_linenumbers
-+ (bfd *);
-+extern alent *coff_get_lineno
-+ (bfd *, asymbol *);
-+extern asymbol *coff_section_symbol
-+ (bfd *, char *);
-+extern bfd_boolean _bfd_coff_get_external_symbols
-+ (bfd *);
-+extern const char *_bfd_coff_read_string_table
-+ (bfd *);
-+extern bfd_boolean _bfd_coff_free_symbols
-+ (bfd *);
-+extern struct coff_ptr_struct *coff_get_normalized_symtab
-+ (bfd *);
-+extern long coff_get_reloc_upper_bound
-+ (bfd *, sec_ptr);
-+extern asymbol *coff_make_empty_symbol
-+ (bfd *);
-+extern void coff_print_symbol
-+ (bfd *, void * filep, asymbol *, bfd_print_symbol_type);
-+extern void coff_get_symbol_info
-+ (bfd *, asymbol *, symbol_info *ret);
-+extern bfd_boolean _bfd_coff_is_local_label_name
-+ (bfd *, const char *);
-+extern asymbol *coff_bfd_make_debug_symbol
-+ (bfd *, void *, unsigned long);
-+extern bfd_boolean coff_find_nearest_line
-+ (bfd *, asection *, asymbol **, bfd_vma, const char **,
-+ const char **, unsigned int *);
-+extern bfd_boolean coff_find_inliner_info
-+ (bfd *, const char **, const char **, unsigned int *);
-+extern int coff_sizeof_headers
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean bfd_coff_reloc16_relax_section
-+ (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
-+extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *,
-+ bfd_byte *, bfd_boolean, asymbol **);
-+extern bfd_vma bfd_coff_reloc16_get_value
-+ (arelent *, struct bfd_link_info *, asection *);
-+extern void bfd_perform_slip
-+ (bfd *, unsigned int, asection *, bfd_vma);
-+
-+/* Functions and types in cofflink.c. */
-+
-+#define STRING_SIZE_SIZE 4
-+
-+/* We use a hash table to merge identical enum, struct, and union
-+ definitions in the linker. */
-+
-+/* Information we keep for a single element (an enum value, a
-+ structure or union field) in the debug merge hash table. */
-+
-+struct coff_debug_merge_element
-+{
-+ /* Next element. */
-+ struct coff_debug_merge_element *next;
-+
-+ /* Name. */
-+ const char *name;
-+
-+ /* Type. */
-+ unsigned int type;
-+
-+ /* Symbol index for complex type. */
-+ long tagndx;
-+};
-+
-+/* A linked list of debug merge entries for a given name. */
-+
-+struct coff_debug_merge_type
-+{
-+ /* Next type with the same name. */
-+ struct coff_debug_merge_type *next;
-+
-+ /* Class of type. */
-+ int class;
-+
-+ /* Symbol index where this type is defined. */
-+ long indx;
-+
-+ /* List of elements. */
-+ struct coff_debug_merge_element *elements;
-+};
-+
-+/* Information we store in the debug merge hash table. */
-+
-+struct coff_debug_merge_hash_entry
-+{
-+ struct bfd_hash_entry root;
-+
-+ /* A list of types with this name. */
-+ struct coff_debug_merge_type *types;
-+};
-+
-+/* The debug merge hash table. */
-+
-+struct coff_debug_merge_hash_table
-+{
-+ struct bfd_hash_table root;
-+};
-+
-+/* Initialize a COFF debug merge hash table. */
-+
-+#define coff_debug_merge_hash_table_init(table) \
-+ (bfd_hash_table_init (&(table)->root, _bfd_coff_debug_merge_hash_newfunc, \
-+ sizeof (struct coff_debug_merge_hash_entry)))
-+
-+/* Free a COFF debug merge hash table. */
-+
-+#define coff_debug_merge_hash_table_free(table) \
-+ (bfd_hash_table_free (&(table)->root))
-+
-+/* Look up an entry in a COFF debug merge hash table. */
-+
-+#define coff_debug_merge_hash_lookup(table, string, create, copy) \
-+ ((struct coff_debug_merge_hash_entry *) \
-+ bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-+
-+/* Information we keep for each section in the output file when doing
-+ a relocatable link. */
-+
-+struct coff_link_section_info
-+{
-+ /* The relocs to be output. */
-+ struct internal_reloc *relocs;
-+ /* For each reloc against a global symbol whose index was not known
-+ when the reloc was handled, the global hash table entry. */
-+ struct coff_link_hash_entry **rel_hashes;
-+};
-+
-+/* Information that we pass around while doing the final link step. */
-+
-+struct coff_final_link_info
-+{
-+ /* General link information. */
-+ struct bfd_link_info *info;
-+ /* Output BFD. */
-+ bfd *output_bfd;
-+ /* Used to indicate failure in traversal routine. */
-+ bfd_boolean failed;
-+ /* If doing "task linking" set only during the time when we want the
-+ global symbol writer to convert the storage class of defined global
-+ symbols from global to static. */
-+ bfd_boolean global_to_static;
-+ /* Hash table for long symbol names. */
-+ struct bfd_strtab_hash *strtab;
-+ /* When doing a relocatable link, an array of information kept for
-+ each output section, indexed by the target_index field. */
-+ struct coff_link_section_info *section_info;
-+ /* Symbol index of last C_FILE symbol (-1 if none). */
-+ long last_file_index;
-+ /* Contents of last C_FILE symbol. */
-+ struct internal_syment last_file;
-+ /* Symbol index of first aux entry of last .bf symbol with an empty
-+ endndx field (-1 if none). */
-+ long last_bf_index;
-+ /* Contents of last_bf_index aux entry. */
-+ union internal_auxent last_bf;
-+ /* Hash table used to merge debug information. */
-+ struct coff_debug_merge_hash_table debug_merge;
-+ /* Buffer large enough to hold swapped symbols of any input file. */
-+ struct internal_syment *internal_syms;
-+ /* Buffer large enough to hold sections of symbols of any input file. */
-+ asection **sec_ptrs;
-+ /* Buffer large enough to hold output indices of symbols of any
-+ input file. */
-+ long *sym_indices;
-+ /* Buffer large enough to hold output symbols for any input file. */
-+ bfd_byte *outsyms;
-+ /* Buffer large enough to hold external line numbers for any input
-+ section. */
-+ bfd_byte *linenos;
-+ /* Buffer large enough to hold any input section. */
-+ bfd_byte *contents;
-+ /* Buffer large enough to hold external relocs of any input section. */
-+ bfd_byte *external_relocs;
-+ /* Buffer large enough to hold swapped relocs of any input section. */
-+ struct internal_reloc *internal_relocs;
-+};
-+
-+/* Most COFF variants have no way to record the alignment of a
-+ section. This struct is used to set a specific alignment based on
-+ the name of the section. */
-+
-+struct coff_section_alignment_entry
-+{
-+ /* The section name. */
-+ const char *name;
-+
-+ /* This is either (unsigned int) -1, indicating that the section
-+ name must match exactly, or it is the number of letters which
-+ must match at the start of the name. */
-+ unsigned int comparison_length;
-+
-+ /* These macros may be used to fill in the first two fields in a
-+ structure initialization. */
-+#define COFF_SECTION_NAME_EXACT_MATCH(name) (name), ((unsigned int) -1)
-+#define COFF_SECTION_NAME_PARTIAL_MATCH(name) (name), (sizeof (name) - 1)
-+
-+ /* Only use this entry if the default section alignment for this
-+ target is at least that much (as a power of two). If this field
-+ is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored. */
-+ unsigned int default_alignment_min;
-+
-+ /* Only use this entry if the default section alignment for this
-+ target is no greater than this (as a power of two). If this
-+ field is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored. */
-+ unsigned int default_alignment_max;
-+
-+#define COFF_ALIGNMENT_FIELD_EMPTY ((unsigned int) -1)
-+
-+ /* The desired alignment for this section (as a power of two). */
-+ unsigned int alignment_power;
-+};
-+
-+extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+extern bfd_boolean _bfd_coff_link_hash_table_init
-+ (struct coff_link_hash_table *, bfd *,
-+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-+ struct bfd_hash_table *,
-+ const char *),
-+ unsigned int);
-+extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
-+ (bfd *);
-+extern const char *_bfd_coff_internal_syment_name
-+ (bfd *, const struct internal_syment *, char *);
-+extern bfd_boolean _bfd_coff_link_add_symbols
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean _bfd_coff_final_link
-+ (bfd *, struct bfd_link_info *);
-+extern struct internal_reloc *_bfd_coff_read_internal_relocs
-+ (bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
-+ struct internal_reloc *);
-+extern bfd_boolean _bfd_coff_generic_relocate_section
-+ (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-+ struct internal_reloc *, struct internal_syment *, asection **);
-+extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
-+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-+extern bfd_boolean _bfd_coff_write_global_sym
-+ (struct coff_link_hash_entry *, void *);
-+extern bfd_boolean _bfd_coff_write_task_globals
-+ (struct coff_link_hash_entry *, void *);
-+extern bfd_boolean _bfd_coff_link_input_bfd
-+ (struct coff_final_link_info *, bfd *);
-+extern bfd_boolean _bfd_coff_reloc_link_order
-+ (bfd *, struct coff_final_link_info *, asection *,
-+ struct bfd_link_order *);
-+
-+
-+#define coff_get_section_contents_in_window \
-+ _bfd_generic_get_section_contents_in_window
-+
-+/* Functions in xcofflink.c. */
-+
-+extern long _bfd_xcoff_get_dynamic_symtab_upper_bound
-+ (bfd *);
-+extern long _bfd_xcoff_canonicalize_dynamic_symtab
-+ (bfd *, asymbol **);
-+extern long _bfd_xcoff_get_dynamic_reloc_upper_bound
-+ (bfd *);
-+extern long _bfd_xcoff_canonicalize_dynamic_reloc
-+ (bfd *, arelent **, asymbol **);
-+extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
-+ (bfd *);
-+extern void _bfd_xcoff_bfd_link_hash_table_free
-+ (struct bfd_link_hash_table *);
-+extern bfd_boolean _bfd_xcoff_bfd_link_add_symbols
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean _bfd_xcoff_bfd_final_link
-+ (bfd *, struct bfd_link_info *);
-+extern bfd_boolean _bfd_ppc_xcoff_relocate_section
-+ (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-+ struct internal_reloc *, struct internal_syment *, asection **);
-+
-+/* Functions in coff-ppc.c. FIXME: These are called be pe.em in the
-+ linker, and so should start with bfd and be declared in bfd.h. */
-+
-+extern bfd_boolean ppc_allocate_toc_section
-+ (struct bfd_link_info *);
-+extern bfd_boolean ppc_process_before_allocation
-+ (bfd *, struct bfd_link_info *);
-+
-+/* Extracted from coffcode.h. */
-+typedef struct coff_ptr_struct
-+{
-+ /* Remembers the offset from the first symbol in the file for
-+ this symbol. Generated by coff_renumber_symbols. */
-+ unsigned int offset;
-+
-+ /* Should the value of this symbol be renumbered. Used for
-+ XCOFF C_BSTAT symbols. Set by coff_slurp_symbol_table. */
-+ unsigned int fix_value : 1;
-+
-+ /* Should the tag field of this symbol be renumbered.
-+ Created by coff_pointerize_aux. */
-+ unsigned int fix_tag : 1;
-+
-+ /* Should the endidx field of this symbol be renumbered.
-+ Created by coff_pointerize_aux. */
-+ unsigned int fix_end : 1;
-+
-+ /* Should the x_csect.x_scnlen field be renumbered.
-+ Created by coff_pointerize_aux. */
-+ unsigned int fix_scnlen : 1;
-+
-+ /* Fix up an XCOFF C_BINCL/C_EINCL symbol. The value is the
-+ index into the line number entries. Set by coff_slurp_symbol_table. */
-+ unsigned int fix_line : 1;
-+
-+ /* The container for the symbol structure as read and translated
-+ from the file. */
-+ union
-+ {
-+ union internal_auxent auxent;
-+ struct internal_syment syment;
-+ } u;
-+} combined_entry_type;
-+
-+
-+/* Each canonical asymbol really looks like this: */
-+
-+typedef struct coff_symbol_struct
-+{
-+ /* The actual symbol which the rest of BFD works with */
-+ asymbol symbol;
-+
-+ /* A pointer to the hidden information for this symbol */
-+ combined_entry_type *native;
-+
-+ /* A pointer to the linenumber information for this symbol */
-+ struct lineno_cache_entry *lineno;
-+
-+ /* Have the line numbers been relocated yet ? */
-+ bfd_boolean done_lineno;
-+} coff_symbol_type;
-+/* COFF symbol classifications. */
-+
-+enum coff_symbol_classification
-+{
-+ /* Global symbol. */
-+ COFF_SYMBOL_GLOBAL,
-+ /* Common symbol. */
-+ COFF_SYMBOL_COMMON,
-+ /* Undefined symbol. */
-+ COFF_SYMBOL_UNDEFINED,
-+ /* Local symbol. */
-+ COFF_SYMBOL_LOCAL,
-+ /* PE section symbol. */
-+ COFF_SYMBOL_PE_SECTION
-+};
-+
-+typedef struct
-+{
-+ void (*_bfd_coff_swap_aux_in)
-+ (bfd *, void *, int, int, int, int, void *);
-+
-+ void (*_bfd_coff_swap_sym_in)
-+ (bfd *, void *, void *);
-+
-+ void (*_bfd_coff_swap_lineno_in)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_aux_out)
-+ (bfd *, void *, int, int, int, int, void *);
-+
-+ unsigned int (*_bfd_coff_swap_sym_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_lineno_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_reloc_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_filehdr_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_aouthdr_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int (*_bfd_coff_swap_scnhdr_out)
-+ (bfd *, void *, void *);
-+
-+ unsigned int _bfd_filhsz;
-+ unsigned int _bfd_aoutsz;
-+ unsigned int _bfd_scnhsz;
-+ unsigned int _bfd_symesz;
-+ unsigned int _bfd_auxesz;
-+ unsigned int _bfd_relsz;
-+ unsigned int _bfd_linesz;
-+ unsigned int _bfd_filnmlen;
-+ bfd_boolean _bfd_coff_long_filenames;
-+ bfd_boolean _bfd_coff_long_section_names;
-+ unsigned int _bfd_coff_default_section_alignment_power;
-+ bfd_boolean _bfd_coff_force_symnames_in_strings;
-+ unsigned int _bfd_coff_debug_string_prefix_length;
-+
-+ void (*_bfd_coff_swap_filehdr_in)
-+ (bfd *, void *, void *);
-+
-+ void (*_bfd_coff_swap_aouthdr_in)
-+ (bfd *, void *, void *);
-+
-+ void (*_bfd_coff_swap_scnhdr_in)
-+ (bfd *, void *, void *);
-+
-+ void (*_bfd_coff_swap_reloc_in)
-+ (bfd *abfd, void *, void *);
-+
-+ bfd_boolean (*_bfd_coff_bad_format_hook)
-+ (bfd *, void *);
-+
-+ bfd_boolean (*_bfd_coff_set_arch_mach_hook)
-+ (bfd *, void *);
-+
-+ void * (*_bfd_coff_mkobject_hook)
-+ (bfd *, void *, void *);
-+
-+ bfd_boolean (*_bfd_styp_to_sec_flags_hook)
-+ (bfd *, void *, const char *, asection *, flagword *);
-+
-+ void (*_bfd_set_alignment_hook)
-+ (bfd *, asection *, void *);
-+
-+ bfd_boolean (*_bfd_coff_slurp_symbol_table)
-+ (bfd *);
-+
-+ bfd_boolean (*_bfd_coff_symname_in_debug)
-+ (bfd *, struct internal_syment *);
-+
-+ bfd_boolean (*_bfd_coff_pointerize_aux_hook)
-+ (bfd *, combined_entry_type *, combined_entry_type *,
-+ unsigned int, combined_entry_type *);
-+
-+ bfd_boolean (*_bfd_coff_print_aux)
-+ (bfd *, FILE *, combined_entry_type *, combined_entry_type *,
-+ combined_entry_type *, unsigned int);
-+
-+ void (*_bfd_coff_reloc16_extra_cases)
-+ (bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
-+ bfd_byte *, unsigned int *, unsigned int *);
-+
-+ int (*_bfd_coff_reloc16_estimate)
-+ (bfd *, asection *, arelent *, unsigned int,
-+ struct bfd_link_info *);
-+
-+ enum coff_symbol_classification (*_bfd_coff_classify_symbol)
-+ (bfd *, struct internal_syment *);
-+
-+ bfd_boolean (*_bfd_coff_compute_section_file_positions)
-+ (bfd *);
-+
-+ bfd_boolean (*_bfd_coff_start_final_link)
-+ (bfd *, struct bfd_link_info *);
-+
-+ bfd_boolean (*_bfd_coff_relocate_section)
-+ (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-+ struct internal_reloc *, struct internal_syment *, asection **);
-+
-+ reloc_howto_type *(*_bfd_coff_rtype_to_howto)
-+ (bfd *, asection *, struct internal_reloc *,
-+ struct coff_link_hash_entry *, struct internal_syment *,
-+ bfd_vma *);
-+
-+ bfd_boolean (*_bfd_coff_adjust_symndx)
-+ (bfd *, struct bfd_link_info *, bfd *, asection *,
-+ struct internal_reloc *, bfd_boolean *);
-+
-+ bfd_boolean (*_bfd_coff_link_add_one_symbol)
-+ (struct bfd_link_info *, bfd *, const char *, flagword,
-+ asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
-+ struct bfd_link_hash_entry **);
-+
-+ bfd_boolean (*_bfd_coff_link_output_has_begun)
-+ (bfd *, struct coff_final_link_info *);
-+
-+ bfd_boolean (*_bfd_coff_final_link_postscript)
-+ (bfd *, struct coff_final_link_info *);
-+
-+} bfd_coff_backend_data;
-+
-+#define coff_backend_info(abfd) \
-+ ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
-+
-+#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
-+ ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
-+
-+#define bfd_coff_swap_sym_in(a,e,i) \
-+ ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
-+
-+#define bfd_coff_swap_lineno_in(a,e,i) \
-+ ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
-+
-+#define bfd_coff_swap_reloc_out(abfd, i, o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
-+
-+#define bfd_coff_swap_lineno_out(abfd, i, o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
-+
-+#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
-+ ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
-+
-+#define bfd_coff_swap_sym_out(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
-+
-+#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
-+
-+#define bfd_coff_swap_filehdr_out(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
-+
-+#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
-+
-+#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
-+#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
-+#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
-+#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
-+#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
-+#define bfd_coff_relsz(abfd) (coff_backend_info (abfd)->_bfd_relsz)
-+#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
-+#define bfd_coff_filnmlen(abfd) (coff_backend_info (abfd)->_bfd_filnmlen)
-+#define bfd_coff_long_filenames(abfd) \
-+ (coff_backend_info (abfd)->_bfd_coff_long_filenames)
-+#define bfd_coff_long_section_names(abfd) \
-+ (coff_backend_info (abfd)->_bfd_coff_long_section_names)
-+#define bfd_coff_default_section_alignment_power(abfd) \
-+ (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
-+#define bfd_coff_swap_filehdr_in(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
-+
-+#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
-+
-+#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
-+
-+#define bfd_coff_swap_reloc_in(abfd, i, o) \
-+ ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
-+
-+#define bfd_coff_bad_format_hook(abfd, filehdr) \
-+ ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
-+
-+#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
-+ ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
-+#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
-+ ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook)\
-+ (abfd, filehdr, aouthdr))
-+
-+#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name, section, flags_ptr)\
-+ ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook)\
-+ (abfd, scnhdr, name, section, flags_ptr))
-+
-+#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
-+ ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
-+
-+#define bfd_coff_slurp_symbol_table(abfd)\
-+ ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
-+
-+#define bfd_coff_symname_in_debug(abfd, sym)\
-+ ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
-+
-+#define bfd_coff_force_symnames_in_strings(abfd)\
-+ (coff_backend_info (abfd)->_bfd_coff_force_symnames_in_strings)
-+
-+#define bfd_coff_debug_string_prefix_length(abfd)\
-+ (coff_backend_info (abfd)->_bfd_coff_debug_string_prefix_length)
-+
-+#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
-+ ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
-+ (abfd, file, base, symbol, aux, indaux))
-+
-+#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order,\
-+ reloc, data, src_ptr, dst_ptr)\
-+ ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
-+ (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
-+
-+#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
-+ ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
-+ (abfd, section, reloc, shrink, link_info))
-+
-+#define bfd_coff_classify_symbol(abfd, sym)\
-+ ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\
-+ (abfd, sym))
-+
-+#define bfd_coff_compute_section_file_positions(abfd)\
-+ ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
-+ (abfd))
-+
-+#define bfd_coff_start_final_link(obfd, info)\
-+ ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
-+ (obfd, info))
-+#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
-+ ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
-+ (obfd, info, ibfd, o, con, rel, isyms, secs))
-+#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
-+ ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
-+ (abfd, sec, rel, h, sym, addendp))
-+#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
-+ ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
-+ (obfd, info, ibfd, sec, rel, adjustedp))
-+#define bfd_coff_link_add_one_symbol(info, abfd, name, flags, section,\
-+ value, string, cp, coll, hashp)\
-+ ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
-+ (info, abfd, name, flags, section, value, string, cp, coll, hashp))
-+
-+#define bfd_coff_link_output_has_begun(a,p) \
-+ ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a, p))
-+#define bfd_coff_final_link_postscript(a,p) \
-+ ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a, p))
-+
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -1601,6 +1601,48 @@ static const char *const bfd_reloc_code_
- "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_390_12",
- "BFD_RELOC_390_GOT12",
- "BFD_RELOC_390_PLT32",
---- /dev/null
-+++ b/bfd/libtool
-@@ -0,0 +1,7871 @@
-+#! /bin/bash
-+
-+# libtool - Provide generalized library-building support services.
-+# Generated automatically by config.status (bfd) 2.18.atmel.1.0.1
-+# Libtool was configured on host hcegtvedt:
-+# 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 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
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=no
-+
-+# Which release of libtool.m4 was used?
-+macro_version=2.2.4
-+macro_revision=1.2976
-+
-+# Whether or not to build static libraries.
-+build_old_libs=yes
-+
-+# What type of objects to build.
-+pic_mode=default
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=needless
-+
-+# The host system.
-+host_alias=i686-pc-linux-gnu
-+host=i686-pc-linux-gnu
-+host_os=linux-gnu
-+
-+# The build system.
-+build_alias=i686-pc-linux-gnu
-+build=i686-pc-linux-gnu
-+build_os=linux-gnu
-+
-+# A sed program that does not truncate output.
-+SED="/bin/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="/bin/grep"
-+
-+# An ERE matcher.
-+EGREP="/bin/grep -E"
-+
-+# A literal string matcher.
-+FGREP="/bin/grep -F"
-+
-+# A BSD- or MS-compatible name lister.
-+NM="nm"
-+
-+# Whether we need soft or hard links.
-+LN_S="ln -s"
-+
-+# What is the maximum length of a command?
-+max_cmd_len=805306365
-+
-+# Object file suffix (normally "o").
-+objext=o
-+
-+# Executable file suffix (normally "").
-+exeext=
-+
-+# whether the shell understands "unset".
-+lt_unset=unset
-+
-+# turn spaces into newlines.
-+SP2NL="tr \\040 \\012"
-+
-+# turn newlines into spaces.
-+NL2SP="tr \\015\\012 \\040\\040"
-+
-+# How to create reloadable object files.
-+reload_flag=" -r"
-+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method="pass_all"
-+
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd="\$MAGIC_CMD"
-+
-+# The archiver.
-+AR="ar"
-+AR_FLAGS="cru"
-+
-+# A symbol stripping program.
-+STRIP="strip"
-+
-+# Commands used to install an old-style archive.
-+RANLIB="ranlib"
-+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-+old_postuninstall_cmds=""
-+
-+# A C compiler.
-+LTCC="gcc"
-+
-+# LTCC compiler flags.
-+LTCFLAGS="-g -O2"
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-+
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
-+
-+# Transform the output of nm in a C name address pair.
-+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
-+
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=.libs
-+
-+# Shell to use when invoking shell scripts.
-+SHELL="/bin/bash"
-+
-+# An echo program that does not interpret backslashes.
-+ECHO="echo"
-+
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=file
-+
-+# Must we lock files when doing compilation?
-+need_locks="no"
-+
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=""
-+
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=""
-+
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=""
-+
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=""
-+
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=""
-+
-+# Old archive suffix (normally "a").
-+libext=a
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds=".so"
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=""
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=no
-+
-+# Do we need a version for libraries?
-+need_version=no
-+
-+# Library versioning type.
-+version_type=linux
-+
-+# Shared library runtime path variable.
-+runpath_var=LD_RUN_PATH
-+
-+# Shared library path variable.
-+shlibpath_var=LD_LIBRARY_PATH
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=no
-+
-+# Format of library name prefix.
-+libname_spec="lib\$name"
-+
-+# 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="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec="\${libname}\${release}\${shared_ext}\$major"
-+
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=""
-+
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=""
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-+
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=""
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=yes
-+
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec="/usr/lib/gcc/i486-linux-gnu/4.2.4 /usr/lib /lib"
-+
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/alsa-lib /usr/local/lib "
-+
-+# Whether dlopen is supported.
-+dlopen_support=unknown
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=unknown
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=unknown
-+
-+# Commands to strip libraries.
-+old_striplib="strip --strip-debug"
-+striplib="strip --strip-unneeded"
-+
-+
-+# The linker used to build libraries.
-+LD="ld"
-+
-+# Commands used to build an old-style archive.
-+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
-+
-+# A language specific compiler.
-+CC="gcc"
-+
-+# Is the compiler the GNU compiler?
-+with_gcc=yes
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=" -fno-builtin"
-+
-+# How to pass a linker flag through the compiler.
-+wl="-Wl,"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=" -fPIC -DPIC"
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag="-static"
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o="yes"
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=yes
-+
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=no
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec="\${wl}--export-dynamic"
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-+
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object="no"
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=""
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=""
-+
-+# Commands used to build a shared archive.
-+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-+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 -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-+
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=""
-+module_expsym_cmds=""
-+
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld="yes"
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=""
-+
-+# Flag that enforces no undefined symbols.
-+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="\${wl}-rpath \${wl}\$libdir"
-+
-+# 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=""
-+
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=""
-+
-+# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=no
-+
-+# 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=no
-+
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=no
-+
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=unsupported
-+
-+# 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=no
-+
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=no
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=unknown
-+
-+# Fix the shell variable $srcfile for the compiler.
-+fix_srcfile_path=""
-+
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=no
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
-+
-+# Symbols that must always be exported.
-+include_expsyms=""
-+
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=""
-+
-+# Specify filename containing input files.
-+file_list_spec=""
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=immediate
-+
-+# ### END LIBTOOL CONFIG
-+
-+# Generated from ltmain.m4sh; do not edit by hand
-+
-+# ltmain.sh (GNU libtool 1.2435 2007/03/18 18:44:42) 2.1a
-+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-+# This is free software; see the source for copying conditions. There is NO
-+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+# 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.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Usage: $progname [OPTION]... [MODE-ARG]...
-+#
-+# Provide generalized library-building support services.
-+#
-+# --config show all configuration variables
-+# --debug enable verbose shell tracing
-+# -n, --dry-run display commands without modifying any files
-+# --features display basic configuration information and exit
-+# --mode=MODE use operation mode MODE
-+# --preserve-dup-deps don't remove duplicate dependency libraries
-+# --quiet, --silent don't print informational messages
-+# --tag=TAG use configuration variables from tag TAG
-+# -v, --verbose print informational messages (default)
-+# --version print version information
-+# -h, --help print short or long help message
-+#
-+# MODE must be one of the following:
-+#
-+# clean remove files from the build directory
-+# compile compile a source file into a libtool object
-+# execute automatically set library path, then run a program
-+# finish complete the installation of libtool libraries
-+# install install libraries or executables
-+# link create a library or an executable
-+# uninstall remove libraries from an installed directory
-+#
-+# MODE-ARGS vary depending on the MODE.
-+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-+#
-+# When reporting a bug, please describe a test case to reproduce it and
-+# include the following information:
-+#
-+# host-triplet: $host
-+# shell: $SHELL
-+# compiler: $LTCC
-+# compiler flags: $LTCFLAGS
-+# linker: $LD (gnu? $with_gnu_ld)
-+# $progname: (GNU libtool 1.2435 2007/03/18 18:44:42) 2.1a
-+# automake: $automake_version
-+# autoconf: $autoconf_version
-+#
-+# Report bugs to <bug-libtool@gnu.org>.
-+
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=2.1a
-+TIMESTAMP=" 1.2435 2007/03/18 18:44:42"
-+package_revision=1.2435
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# NLS nuisances: We save the old values to restore during execute mode.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-+
-+$lt_unset CDPATH
-+
-+
-+
-+
-+
-+: ${CP="cp -f"}
-+: ${ECHO="echo"}
-+: ${EGREP="/bin/grep -E"}
-+: ${FGREP="/bin/grep -F"}
-+: ${GREP="/bin/grep"}
-+: ${LN_S="ln -s"}
-+: ${MAKE="make"}
-+: ${MKDIR="mkdir"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+: ${SED="/bin/sed"}
-+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-+: ${Xsed="$SED -e 1s/^X//"}
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-+
-+exit_status=$EXIT_SUCCESS
-+
-+# Make sure IFS has a sensible default
-+lt_nl='
-+'
-+IFS=" $lt_nl"
-+
-+dirname="s,/[^/]*$,,"
-+basename="s,^.*/,,"
-+
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
-+
-+# The name of this program:
-+# In the unlikely event $progname began with a '-', it would play havoc with
-+# func_echo (imagine progname=-n), so we prepend ./ in that case:
-+progname=`$ECHO "X$progpath" | $Xsed -e "$basename" -e 's,^-,./-,'`
-+
-+# Make sure we have an absolute path for reexecution:
-+case $progpath in
-+ [\\/]*|[A-Za-z]:\\*) ;;
-+ *[\\/]*)
-+ progdir=`$ECHO "X$progpath" | $Xsed -e "$dirname"`
-+ progdir=`cd "$progdir" && pwd`
-+ progpath="$progdir/$progname"
-+ ;;
-+ *)
-+ save_IFS="$IFS"
-+ IFS=:
-+ for progdir in $PATH; do
-+ IFS="$save_IFS"
-+ test -x "$progdir/$progname" && break
-+ done
-+ IFS="$save_IFS"
-+ test -n "$progdir" || progdir=`pwd`
-+ progpath="$progdir/$progname"
-+ ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Re-`\' parameter expansions in output of double_quote_subst that were
-+# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-+# in input to double_quote_subst, that '$' was protected from expansion.
-+# Since each input `\' is now two `\'s, look for any number of runs of
-+# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-+bs='\\'
-+bs2='\\\\'
-+bs4='\\\\\\\\'
-+dollar='\$'
-+sed_double_backslash="\
-+ s/$bs4/&\\
-+/g
-+ s/^$bs2$dollar/$bs&/
-+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-+ s/\n//g"
-+
-+# Standard options:
-+opt_dry_run=false
-+opt_help=false
-+opt_quiet=false
-+opt_verbose=false
-+
-+# func_echo arg...
-+# Echo program name prefixed message, along with the current mode
-+# name if it has been set yet.
-+func_echo ()
-+{
-+ $ECHO "$progname${mode+: }$mode: "${1+"$@"}
-+}
-+
-+# func_verbose arg...
-+# Echo program name prefixed message in verbose mode only.
-+func_verbose ()
-+{
-+ $opt_verbose && func_echo ${1+"$@"}
-+
-+ # A bug in bash halts the script if the last line of a function
-+ # fails when set -e is in force, so we need another command to
-+ # work around that:
-+ :
-+}
-+
-+# func_error arg...
-+# Echo program name prefixed message to standard error.
-+func_error ()
-+{
-+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-+}
-+
-+# func_warning arg...
-+# Echo program name prefixed warning message to standard error.
-+func_warning ()
-+{
-+ $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-+}
-+
-+# func_fatal_error arg...
-+# Echo program name prefixed message to standard error, and exit.
-+func_fatal_error ()
-+{
-+ func_error ${1+"$@"}
-+ exit $EXIT_FAILURE
-+}
-+
-+# func_fatal_help arg...
-+# Echo program name prefixed message to standard error, followed by
-+# a help hint, and exit.
-+func_fatal_help ()
-+{
-+ func_error ${1+"$@"}
-+ func_fatal_error "$help"
-+}
-+help="Try \`$progname --help' for more information." ## default
-+
-+
-+# func_grep expression filename
-+# Check whether EXPRESSION matches any line of FILENAME, without output.
-+func_grep ()
-+{
-+ $GREP "$1" "$2" >/dev/null 2>&1
-+}
-+
-+
-+# func_mkdir_p directory-path
-+# Make sure the entire path to DIRECTORY-PATH is available.
-+func_mkdir_p ()
-+{
-+ my_directory_path="$1"
-+ my_dir_list=
-+
-+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-+
-+ # Protect directory names starting with `-'
-+ case $my_directory_path in
-+ -*) my_directory_path="./$my_directory_path" ;;
-+ esac
-+
-+ # While some portion of DIR does not yet exist...
-+ while test ! -d "$my_directory_path"; do
-+ # ...make a list in topmost first order. Use a colon delimited
-+ # list incase some portion of path contains whitespace.
-+ my_dir_list="$my_directory_path:$my_dir_list"
-+
-+ # If the last portion added has no slash in it, the list is done
-+ case $my_directory_path in */*) ;; *) break ;; esac
-+
-+ # ...otherwise throw away the child directory and loop
-+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-+ done
-+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-+
-+ save_mkdir_p_IFS="$IFS"; IFS=':'
-+ for my_dir in $my_dir_list; do
-+ IFS="$save_mkdir_p_IFS"
-+ # mkdir can fail with a `File exist' error if two processes
-+ # try to create one of the directories concurrently. Don't
-+ # stop in that case!
-+ $MKDIR "$my_dir" 2>/dev/null || :
-+ done
-+ IFS="$save_mkdir_p_IFS"
-+
-+ # Bail out if we (or some other process) failed to create a directory.
-+ test -d "$my_directory_path" || \
-+ func_fatal_error "Failed to create \`$1'"
-+ fi
-+}
-+
-+
-+# func_mktempdir [string]
-+# Make a temporary directory that won't clash with other running
-+# libtool processes, and avoids race conditions if possible. If
-+# given, STRING is the basename for that directory.
-+func_mktempdir ()
-+{
-+ my_template="${TMPDIR-/tmp}/${1-$progname}"
-+
-+ if test "$opt_dry_run" = ":"; then
-+ # Return a directory name, but don't create it in dry-run mode
-+ my_tmpdir="${my_template}-$$"
-+ else
-+
-+ # If mktemp works, use that first and foremost
-+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-+
-+ if test ! -d "$my_tmpdir"; then
-+ # Failing that, at least try and use $RANDOM to avoid a race
-+ my_tmpdir="${my_template}-${RANDOM-0}$$"
-+
-+ save_mktempdir_umask=`umask`
-+ umask 0077
-+ $MKDIR "$my_tmpdir"
-+ umask $save_mktempdir_umask
-+ fi
-+
-+ # If we're not in dry-run mode, bomb out on failure
-+ test -d "$my_tmpdir" || \
-+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-+ fi
-+
-+ $ECHO "X$my_tmpdir" | $Xsed
-+}
-+
-+
-+# func_quote_for_eval arg
-+# Aesthetically quote ARG to be evaled later.
-+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-+# is double-quoted, suitable for a subsequent eval, whereas
-+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-+# which are still active within double quotes backslashified.
-+func_quote_for_eval ()
-+{
-+ case $1 in
-+ *[\\\`\"\$]*)
-+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-+ *)
-+ func_quote_for_eval_unquoted_result="$1" ;;
-+ esac
-+
-+ case $func_quote_for_eval_unquoted_result in
-+ # Double-quote args containing shell metacharacters to delay
-+ # word splitting, command substitution and and variable
-+ # expansion for a subsequent eval.
-+ # Many Bourne shells cannot handle close brackets correctly
-+ # in scan sets, so we specify it separately.
-+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-+ ;;
-+ *)
-+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-+ esac
-+}
-+
-+
-+# func_quote_for_expand arg
-+# Aesthetically quote ARG to be evaled later; same as above,
-+# but do not quote variable references.
-+func_quote_for_expand ()
-+{
-+ case $1 in
-+ *[\\\`\"]*)
-+ my_arg=`$ECHO "X$1" | $Xsed \
-+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-+ *)
-+ my_arg="$1" ;;
-+ esac
-+
-+ case $my_arg in
-+ # Double-quote args containing shell metacharacters to delay
-+ # word splitting and command substitution for a subsequent eval.
-+ # Many Bourne shells cannot handle close brackets correctly
-+ # in scan sets, so we specify it separately.
-+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-+ my_arg="\"$my_arg\""
-+ ;;
-+ esac
-+
-+ func_quote_for_expand_result="$my_arg"
-+}
-+
-+
-+# func_show_eval cmd [fail_exp]
-+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-+# is given, then evaluate it.
-+func_show_eval ()
-+{
-+ my_cmd="$1"
-+ my_fail_exp="${2-:}"
-+
-+ ${opt_silent-false} || {
-+ func_quote_for_expand "$my_cmd"
-+ eval "func_echo $func_quote_for_expand_result"
-+ }
-+
-+ if ${opt_dry_run-false}; then :; else
-+ eval "$my_cmd"
-+ my_status=$?
-+ if test "$my_status" -eq 0; then :; else
-+ eval "(exit $my_status); $my_fail_exp"
-+ fi
-+ fi
-+}
-+
-+
-+
-+
-+
-+# func_version
-+# Echo version message to standard output and exit.
-+func_version ()
-+{
-+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-+ s/^# //
-+ s/^# *$//
-+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-+ p
-+ }' < "$progpath"
-+ exit $?
-+}
-+
-+# func_usage
-+# Echo short help message to standard output and exit.
-+func_usage ()
-+{
-+ $SED -n '/^# Usage:/,/# -h/ {
-+ s/^# //
-+ s/^# *$//
-+ s/\$progname/'$progname'/
-+ p
-+ }' < "$progpath"
-+ $ECHO
-+ $ECHO "run \`$progname --help | more' for full usage"
-+ exit $?
-+}
-+
-+# func_help
-+# Echo long help message to standard output and exit.
-+func_help ()
-+{
-+ $SED -n '/^# Usage:/,/# Report bugs to/ {
-+ s/^# //
-+ s/^# *$//
-+ s*\$progname*'$progname'*
-+ s*\$host*'"$host"'*
-+ s*\$SHELL*'"$SHELL"'*
-+ s*\$LTCC*'"$LTCC"'*
-+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
-+ s*\$LD*'"$LD"'*
-+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
-+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-+ p
-+ }' < "$progpath"
-+ exit $?
-+}
-+
-+# func_missing_arg argname
-+# Echo program name prefixed message to standard error and set global
-+# exit_cmd.
-+func_missing_arg ()
-+{
-+ func_error "missing argument for $1"
-+ exit_cmd=exit
-+}
-+
-+exit_cmd=:
-+
-+
-+
-+
-+
-+# Check that we have a working $ECHO.
-+if test "X$1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X$1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-+ # Yippee, $ECHO works!
-+ :
-+else
-+ # Restart under the correct shell, and then maybe $ECHO will work.
-+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+$*
-+EOF
-+ exit $EXIT_SUCCESS
-+fi
-+
-+magic="%%%MAGIC variable%%%"
-+
-+
-+# Global variables.
-+# $mode is unset
-+nonopt=
-+execute_dlfiles=
-+preserve_args=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-+
-+opt_dry_run=false
-+opt_duplicate_deps=false
-+opt_silent=false
-+opt_debug=:
-+
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end. This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
-+# func_fatal_configuration arg...
-+# Echo program name prefixed message to standard error, followed by
-+# a configuration failure hint, and exit.
-+func_fatal_configuration ()
-+{
-+ func_error ${1+"$@"}
-+ func_error "See the $PACKAGE documentation for more information."
-+ func_fatal_error "Fatal configuration error."
-+}
-+
-+
-+# func_config
-+# Display the configuration for all the tags in this script.
-+func_config ()
-+{
-+ re_begincf='^# ### BEGIN LIBTOOL'
-+ re_endcf='^# ### END LIBTOOL'
-+
-+ # Default configuration.
-+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-+
-+ # Now print the configurations for the tags.
-+ for tagname in $taglist; do
-+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-+ done
-+
-+ exit $?
-+}
-+
-+# func_features
-+# Display the features supported by this script.
-+func_features ()
-+{
-+ $ECHO "host: $host"
-+ if test "$build_libtool_libs" = yes; then
-+ $ECHO "enable shared libraries"
-+ else
-+ $ECHO "disable shared libraries"
-+ fi
-+ if test "$build_old_libs" = yes; then
-+ $ECHO "enable static libraries"
-+ else
-+ $ECHO "disable static libraries"
-+ fi
-+
-+ exit $?
-+}
-+
-+# func_enable_tag tagname
-+# Verify that TAGNAME is valid, and either flag an error and exit, or
-+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
-+# variable here.
-+func_enable_tag ()
-+{
-+ # Global variable:
-+ tagname="$1"
-+
-+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-+ sed_extractcf="/$re_begincf/,/$re_endcf/p"
-+
-+ # Validate tagname.
-+ case $tagname in
-+ *[!-_A-Za-z0-9,/]*)
-+ func_fatal_error "invalid tag name: $tagname"
-+ ;;
-+ esac
-+
-+ # Don't test for the "default" C tag, as we know it's
-+ # there but not specially marked.
-+ case $tagname in
-+ CC) ;;
-+ *)
-+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-+ taglist="$taglist $tagname"
-+
-+ # Evaluate the configuration. Be careful to quote the path
-+ # and the sed script, to avoid splitting on whitespace, but
-+ # also don't use non-portable quotes within backquotes within
-+ # quotes we have to do it in 2 steps:
-+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-+ eval "$extractedcf"
-+ else
-+ func_error "ignoring unknown tag $tagname"
-+ fi
-+ ;;
-+ esac
-+}
-+
-+
-+func_mode_help ()
-+{
-+ # We need to display help for each of the modes.
-+ case $mode in
-+ "")
-+ # Generic help is extracted from the usage comments
-+ # at the start of this file.
-+ func_help
-+ ;;
-+
-+ clean)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+ ;;
-+
-+ compile)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-+
-+Compile a source file into a libtool library object.
-+
-+This mode accepts the following additional options:
-+
-+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
-+ -no-suppress do not suppress compiler output for multiple passes
-+ -prefer-pic try to building PIC objects only
-+ -prefer-non-pic try to building non-PIC objects only
-+ -shared do not build a \`.o' file suitable for static linking
-+ -static only build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
-+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+ ;;
-+
-+ execute)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-+
-+Automatically set library path, then run a program.
-+
-+This mode accepts the following additional options:
-+
-+ -dlopen FILE add the directory containing FILE to the library path
-+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
-+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
-+
-+Then, COMMAND is executed, with ARGS as arguments."
-+ ;;
-+
-+ finish)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-+
-+Complete the installation of libtool libraries.
-+
-+Each LIBDIR is a directory that contains libtool libraries.
-+
-+The commands that this mode executes may require superuser privileges. Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+ ;;
-+
-+ install)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command. The first component should be
-+either the \`install' or \`cp' program.
-+
-+The following components of INSTALL-COMMAND are treated specially:
-+
-+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
-+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+ ;;
-+
-+ link)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
-+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
-+
-+The following components of LINK-COMMAND are treated specially:
-+
-+ -all-static do not do any dynamic linking at all
-+ -avoid-version do not add a version suffix if possible
-+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+ -export-symbols SYMFILE
-+ try to export only the symbols listed in SYMFILE
-+ -export-symbols-regex REGEX
-+ try to export only the symbols matching REGEX
-+ -LLIBDIR search LIBDIR for required installed libraries
-+ -lNAME OUTPUT-FILE requires the installed library libNAME
-+ -module build a library that can dlopened
-+ -no-fast-install disable the fast-install mode
-+ -no-install link a not-installable executable
-+ -no-undefined declare that a library does not refer to external symbols
-+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-+ -objectlist FILE Use a list of object files found in FILE to specify objects
-+ -precious-files-regex REGEX
-+ don't remove output files matching REGEX
-+ -release RELEASE specify package release information
-+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
-+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-+ -shared only do dynamic linking of libtool libraries
-+ -shrext SUFFIX override the standard shared library file extension
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
-+ -version-info CURRENT[:REVISION[:AGE]]
-+ specify library version info [each variable defaults to 0]
-+ -weak LIBNAME declare that the target provides the LIBNAME interface
-+
-+All other options (arguments beginning with \`-') are ignored.
-+
-+Every other argument is treated as a filename. Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
-+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
-+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+ ;;
-+
-+ uninstall)
-+ $ECHO \
-+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+ ;;
-+
-+ *)
-+ func_fatal_help "invalid operation mode \`$mode'"
-+ ;;
-+ esac
-+
-+ $ECHO
-+ $ECHO "Try \`$progname --help' for more information about other modes."
-+
-+ exit $?
-+}
-+
-+# Generated shell functions inserted here.
-+
-+# 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}
-+}
-+
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+ eval "$1+=\$2"
-+}
-+# Generated shell functions inserted here.
-+
-+
-+# Parse options once, thoroughly. This comes as soon as possible in
-+# the script to make things like `libtool --version' happen quickly.
-+{
-+
-+ # Shorthand for --mode=foo, only valid as the first argument
-+ case $1 in
-+ clean|clea|cle|cl)
-+ shift; set dummy --mode clean ${1+"$@"}; shift
-+ ;;
-+ compile|compil|compi|comp|com|co|c)
-+ shift; set dummy --mode compile ${1+"$@"}; shift
-+ ;;
-+ execute|execut|execu|exec|exe|ex|e)
-+ shift; set dummy --mode execute ${1+"$@"}; shift
-+ ;;
-+ finish|finis|fini|fin|fi|f)
-+ shift; set dummy --mode finish ${1+"$@"}; shift
-+ ;;
-+ install|instal|insta|inst|ins|in|i)
-+ shift; set dummy --mode install ${1+"$@"}; shift
-+ ;;
-+ link|lin|li|l)
-+ shift; set dummy --mode link ${1+"$@"}; shift
-+ ;;
-+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+ shift; set dummy --mode uninstall ${1+"$@"}; shift
-+ ;;
-+ esac
-+
-+ # Parse non-mode specific arguments:
-+ while test "$#" -gt 0; do
-+ opt="$1"
-+ shift
-+
-+ case $opt in
-+ --config) func_config ;;
-+
-+ --debug) preserve_args="$preserve_args $opt"
-+ func_echo "enabling shell trace mode"
-+ opt_debug='set -x'
-+ $opt_debug
-+ ;;
-+
-+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
-+ execute_dlfiles="$execute_dlfiles $1"
-+ shift
-+ ;;
-+
-+ --dry-run | -n) opt_dry_run=: ;;
-+ --features) func_features ;;
-+ --finish) mode="finish" ;;
-+
-+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
-+ case $1 in
-+ # Valid mode arguments:
-+ clean) ;;
-+ compile) ;;
-+ execute) ;;
-+ finish) ;;
-+ install) ;;
-+ link) ;;
-+ relink) ;;
-+ uninstall) ;;
-+
-+ # Catch anything else as an error
-+ *) func_error "invalid argument for $opt"
-+ exit_cmd=exit
-+ break
-+ ;;
-+ esac
-+
-+ mode="$1"
-+ shift
-+ ;;
-+
-+ --preserve-dup-deps)
-+ opt_duplicate_deps=: ;;
-+
-+ --quiet|--silent) preserve_args="$preserve_args $opt"
-+ opt_silent=:
-+ ;;
-+
-+ --verbose| -v) preserve_args="$preserve_args $opt"
-+ opt_silent=false
-+ ;;
-+
-+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
-+ preserve_args="$preserve_args $opt $1"
-+ func_enable_tag "$1" # tagname is set here
-+ shift
-+ ;;
-+
-+ # Separate optargs to long options:
-+ -dlopen=*|--mode=*|--tag=*)
-+ func_opt_split "$opt"
-+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+ shift
-+ ;;
-+
-+ -\?|-h) func_usage ;;
-+ --help) opt_help=: ;;
-+ --version) func_version ;;
-+
-+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
-+
-+ *) nonopt="$opt"
-+ break
-+ ;;
-+ esac
-+ done
-+
-+ # Now that we've collected a possible --mode arg, show help if necessary
-+ $opt_help && func_mode_help
-+
-+ case $host in
-+ *cygwin* | *mingw* | *pw32*)
-+ # don't eliminate duplications in $postdeps and $predeps
-+ opt_duplicate_compiler_generated_deps=:
-+ ;;
-+ *)
-+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+ ;;
-+ esac
-+
-+ # Having warned about all mis-specified options, bail out if
-+ # anything was wrong.
-+ $exit_cmd $EXIT_FAILURE
-+}
-+
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
-+{
-+ if test "$package_revision" != "$macro_revision"; then
-+ if test "$VERSION" != "$macro_version"; then
-+ if test -z "$macro_version"; then
-+ cat >&2 <<_LT_EOF
-+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+ else
-+ cat >&2 <<_LT_EOF
-+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+ fi
-+ else
-+ cat >&2 <<_LT_EOF
-+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-+ fi
-+
-+ exit $EXIT_MISMATCH
-+ fi
-+}
-+
-+
-+## ----------- ##
-+## Main. ##
-+## ----------- ##
-+
-+{
-+ # Sanity checks first:
-+ func_check_version_match
-+
-+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+ func_fatal_configuration "not configured to build any kind of library"
-+ fi
-+
-+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-+
-+
-+ # Darwin sucks
-+ eval std_shrext=\"$shrext_cmds\"
-+
-+
-+ # Only execute mode is allowed to have -dlopen flags.
-+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+ func_error "unrecognized option \`-dlopen'"
-+ $ECHO "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ # Change the help message to a mode-specific one.
-+ generic_help="$help"
-+ help="Try \`$progname --help --mode=$mode' for more information."
-+}
-+
-+
-+# func_lalib_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_lalib_p ()
-+{
-+ $SED -e 4q "$1" 2>/dev/null \
-+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-+}
-+
-+# func_lalib_unsafe_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
-+# This function implements the same check as func_lalib_p without
-+# resorting to external programs. To this end, it redirects stdin and
-+# closes it afterwards, without saving the original file descriptor.
-+# As a safety measure, use it only where a negative result would be
-+# fatal anyway. Works if `file' does not exist.
-+func_lalib_unsafe_p ()
-+{
-+ lalib_p=no
-+ if test -r "$1" && exec 5<&1 <"$1"; then
-+ for lalib_p_l in 1 2 3 4
-+ do
-+ read lalib_p_line
-+ case "$lalib_p_line" in
-+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-+ esac
-+ done
-+ exec 1<&5 5<&-
-+ fi
-+ test "$lalib_p" = yes
-+}
-+
-+# func_ltwrapper_p file
-+# True iff FILE is a libtool wrapper script.
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_ltwrapper_p ()
-+{
-+ func_lalib_p "$1"
-+}
-+
-+
-+# func_execute_cmds commands fail_cmd
-+# Execute tilde-delimited COMMANDS.
-+# If FAIL_CMD is given, eval that upon failure.
-+# FAIL_CMD may read-access the current command in variable CMD!
-+func_execute_cmds ()
-+{
-+ $opt_debug
-+ save_ifs=$IFS; IFS='~'
-+ for cmd in $1; do
-+ IFS=$save_ifs
-+ eval cmd=\"$cmd\"
-+ func_show_eval "$cmd" "${2-:}"
-+ done
-+ IFS=$save_ifs
-+}
-+
-+
-+# func_source file
-+# Source FILE, adding directory component if necessary.
-+# Note that it is not necessary on cygwin/mingw to append a dot to
-+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-+# behavior happens only for exec(3), not for open(2)! Also, sourcing
-+# `FILE.' does not work on cygwin managed mounts.
-+func_source ()
-+{
-+ $opt_debug
-+ case $1 in
-+ */* | *\\*) . "$1" ;;
-+ *) . "./$1" ;;
-+ esac
-+}
-+
-+
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
-+# Need a lot of goo to handle *both* DLLs and import libs
-+# Has to be a shell function in order to 'eat' the argument
-+# that is supplied when $file_magic_command is called.
-+func_win32_libid ()
-+{
-+ $opt_debug
-+ win32_libid_type="unknown"
-+ win32_fileres=`file -L $1 2>/dev/null`
-+ case $win32_fileres in
-+ *ar\ archive\ import\ library*) # definitely import
-+ win32_libid_type="x86 archive import"
-+ ;;
-+ *ar\ archive*) # could be an import, or static
-+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+ win32_nmres=`eval $NM -f posix -A $1 |
-+ $SED -n -e '
-+ 1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
-+ case $win32_nmres in
-+ import*) win32_libid_type="x86 archive import";;
-+ *) win32_libid_type="x86 archive static";;
-+ esac
-+ fi
-+ ;;
-+ *DLL*)
-+ win32_libid_type="x86 DLL"
-+ ;;
-+ *executable*) # but shell scripts are "executable" too...
-+ case $win32_fileres in
-+ *MS\ Windows\ PE\ Intel*)
-+ win32_libid_type="x86 DLL"
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ $ECHO "$win32_libid_type"
-+}
-+
-+
-+
-+# func_infer_tag arg
-+# Infer tagged configuration to use if any are available and
-+# if one wasn't chosen via the "--tag" command line option.
-+# Only attempt this if the compiler in the base compile
-+# command doesn't match the default compiler.
-+# arg is usually of the form 'gcc ...'
-+func_infer_tag ()
-+{
-+ $opt_debug
-+ if test -n "$available_tags" && test -z "$tagname"; then
-+ CC_quoted=
-+ for arg in $CC; do
-+ func_quote_for_eval "$arg"
-+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+ done
-+ case $@ in
-+ # Blanks in the command may have been stripped by the calling shell,
-+ # but not from the CC environment variable when configure was run.
-+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-+ # Blanks at the start of $base_compile will cause this to fail
-+ # if we don't check for them as well.
-+ *)
-+ for z in $available_tags; do
-+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+ # Evaluate the configuration.
-+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+ CC_quoted=
-+ for arg in $CC; do
-+ # Double-quote args containing other shell metacharacters.
-+ func_quote_for_eval "$arg"
-+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+ done
-+ case "$@ " in
-+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-+ # The compiler in the base compile command matches
-+ # the one in the tagged configuration.
-+ # Assume this is the tagged configuration we want.
-+ tagname=$z
-+ break
-+ ;;
-+ esac
-+ fi
-+ done
-+ # If $tagname still isn't set, then no tagged configuration
-+ # was found and let the user know that the "--tag" command
-+ # line option must be used.
-+ if test -z "$tagname"; then
-+ func_echo "unable to infer tagged configuration"
-+ func_fatal_error "specify a tag with \`--tag'"
-+# else
-+# func_verbose "using $tagname tagged configuration"
-+ fi
-+ ;;
-+ esac
-+ fi
-+}
-+
-+
-+
-+# func_generate_dlsyms outputname originator pic_p
-+# Extract symbols from dlprefiles and create ${outputname}S.o with
-+# a dlpreopen symbol table.
-+func_generate_dlsyms ()
-+{
-+ $opt_debug
-+ my_outputname="$1"
-+ my_originator="$2"
-+ my_pic_p="${3-no}"
-+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-+ my_dlsyms=
-+
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+ my_dlsyms="${my_outputname}S.c"
-+ else
-+ func_error "not configured to extract global symbols from dlpreopened files"
-+ fi
-+ fi
-+
-+ if test -n "$my_dlsyms"; then
-+ case $my_dlsyms in
-+ "") ;;
-+ *.c)
-+ # Discover the nlist of each of the dlfiles.
-+ nlist="$output_objdir/${my_outputname}.nm"
-+
-+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-+
-+ # Parse the name list into a source file.
-+ func_echo "creating $output_objdir/$my_dlsyms"
-+
-+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+ if test "$dlself" = yes; then
-+ func_echo "generating symbol list for \`$output'"
-+
-+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-+
-+ # Add our own program objects to the symbol list.
-+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ for progfile in $progfiles; do
-+ func_echo "extracting global C symbols from \`$progfile'"
-+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+ done
-+
-+ if test -n "$exclude_expsyms"; then
-+ $opt_dry_run || {
-+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+ eval '$MV "$nlist"T "$nlist"'
-+ }
-+ fi
-+
-+ if test -n "$export_symbols_regex"; then
-+ $opt_dry_run || {
-+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+ eval '$MV "$nlist"T "$nlist"'
-+ }
-+ fi
-+
-+ # Prepare the list of exported symbols
-+ if test -z "$export_symbols"; then
-+ export_symbols="$output_objdir/$outputname.exp"
-+ $opt_dry_run || {
-+ $RM $export_symbols
-+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+ case $host in
-+ *cygwin* | *mingw* )
-+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-+ ;;
-+ esac
-+ }
-+ else
-+ $opt_dry_run || {
-+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-+ eval '$MV "$nlist"T "$nlist"'
-+ case $host in
-+ *cygwin | *mingw* )
-+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+ ;;
-+ esac
-+ }
-+ fi
-+ fi
-+
-+ for dlprefile in $dlprefiles; do
-+ func_echo "extracting global C symbols from \`$dlprefile'"
-+ func_basename "$dlprefile"
-+ name="$func_basename_result"
-+ $opt_dry_run || {
-+ eval '$ECHO ": $name " >> "$nlist"'
-+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+ }
-+ done
-+
-+ $opt_dry_run || {
-+ # Make sure we have at least an empty file.
-+ test -f "$nlist" || : > "$nlist"
-+
-+ if test -n "$exclude_expsyms"; then
-+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+ $MV "$nlist"T "$nlist"
-+ fi
-+
-+ # Try sorting and uniquifying the output.
-+ if $GREP -v "^: " < "$nlist" |
-+ if sort -k 3 </dev/null >/dev/null 2>&1; then
-+ sort -k 3
-+ else
-+ sort +2
-+ fi |
-+ uniq > "$nlist"S; then
-+ :
-+ else
-+ $GREP -v "^: " < "$nlist" > "$nlist"S
-+ fi
-+
-+ if test -f "$nlist"S; then
-+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-+ else
-+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+ fi
-+
-+ $ECHO >> "$output_objdir/$my_dlsyms" "\
-+
-+/* The mapping between symbol names and symbols. */
-+typedef struct {
-+ const char *name;
-+ void *address;
-+} lt_dlsymlist;
-+"
-+ case $host in
-+ *cygwin* | *mingw* )
-+ $ECHO >> "$output_objdir/$my_dlsyms" "\
-+/* DATA imports from DLLs on WIN32 con't be const, because
-+ runtime relocations are performed -- see ld's documentation
-+ on pseudo-relocs. */"
-+ lt_dlsym_const= ;;
-+ *osf5*)
-+ echo >> "$output_objdir/$my_dlsyms" "\
-+/* This system does not cope well with relocations in const data */"
-+ lt_dlsym_const= ;;
-+ *)
-+ lt_dlsym_const=const ;;
-+ esac
-+
-+ $ECHO >> "$output_objdir/$my_dlsyms" "\
-+extern $lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[];
-+$lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[] =
-+{\
-+ { \"$my_originator\", (void *) 0 },"
-+
-+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-+
-+ $ECHO >> "$output_objdir/$my_dlsyms" "\
-+ {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt_${my_prefix}_LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+ } # !$opt_dry_run
-+
-+ pic_flag_for_symtable=
-+ case "$compile_command " in
-+ *" -static "*) ;;
-+ *)
-+ case $host in
-+ # compiling the symbol table file with pic_flag works around
-+ # a FreeBSD bug that causes programs to crash when -lm is
-+ # linked before any other PIC object. But we must not use
-+ # pic_flag when linking with -static. The problem exists in
-+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-+ *-*-hpux*)
-+ pic_flag_for_symtable=" $pic_flag" ;;
-+ *)
-+ if test "X$my_pic_p" != Xno; then
-+ pic_flag_for_symtable=" $pic_flag"
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ symtab_cflags=
-+ for arg in $LTCFLAGS; do
-+ case $arg in
-+ -pie | -fpie | -fPIE) ;;
-+ *) symtab_cflags="$symtab_cflags $arg" ;;
-+ esac
-+ done
-+
-+ # Now compile the dynamic symbol file.
-+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-+
-+ # Clean up the generated files.
-+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-+
-+ # Transform the symbol file into the correct name.
-+ symfileobj="$output_objdir/${my_outputname}S.$objext"
-+ case $host in
-+ *cygwin* | *mingw* )
-+ if test -f "$output_objdir/$my_outputname.def"; then
-+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+ else
-+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+ fi
-+ ;;
-+ *)
-+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ func_fatal_error "unknown suffix for \`$my_dlsyms'"
-+ ;;
-+ esac
-+ else
-+ # We keep going just in case the user didn't refer to
-+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
-+ # really was required.
-+
-+ # Nullify the symbol file.
-+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ fi
-+}
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+ $opt_debug
-+ f_ex_an_ar_dir="$1"; shift
-+ f_ex_an_ar_oldlib="$1"
-+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" 'exit $?'
-+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+ :
-+ else
-+ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-+ fi
-+}
-+
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+ $opt_debug
-+ my_gentop="$1"; shift
-+ my_oldlibs=${1+"$@"}
-+ my_oldobjs=""
-+ my_xlib=""
-+ my_xabs=""
-+ my_xdir=""
-+
-+ for my_xlib in $my_oldlibs; do
-+ # Extract the objects.
-+ case $my_xlib in
-+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+ *) my_xabs=`pwd`"/$my_xlib" ;;
-+ esac
-+ func_basename "$my_xlib"
-+ my_xlib="$func_basename_result"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-+
-+ func_mkdir_p "$my_xdir"
-+
-+ case $host in
-+ *-darwin*)
-+ func_echo "Extracting $my_xabs"
-+ # Do not bother doing anything if just a dry run
-+ $opt_dry_run || {
-+ darwin_orig_dir=`pwd`
-+ cd $my_xdir || exit $?
-+ darwin_archive=$my_xabs
-+ darwin_curdir=`pwd`
-+ darwin_base_archive=`basename $darwin_archive`
-+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-+ if test -n "$darwin_arches"; then
-+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-+ darwin_arch=
-+ func_echo "$darwin_base_archive has multiple architectures $darwin_arches"
-+ for darwin_arch in $darwin_arches ; do
-+ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+ cd "$darwin_curdir"
-+ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+ done # $darwin_arches
-+ ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+ darwin_file=
-+ darwin_files=
-+ for darwin_file in $darwin_filelist; do
-+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+ lipo -create -output "$darwin_file" $darwin_files
-+ done # $darwin_filelist
-+ $RM -rf unfat-$$
-+ cd "$darwin_orig_dir"
-+ else
-+ cd $darwin_orig_dir
-+ func_extract_an_archive "$my_xdir" "$my_xabs"
-+ fi # $darwin_arches
-+ } # !$opt_dry_run
-+ ;;
-+ *)
-+ func_extract_an_archive "$my_xdir" "$my_xabs"
-+ ;;
-+ esac
-+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+ done
-+
-+ func_extract_archives_result="$my_oldobjs"
-+}
-+
-+
-+
-+# func_write_libtool_object output_name pic_name nonpic_name
-+# Create a libtool object file (analogous to a ".la" file),
-+# but don't create it if we're doing a dry run.
-+func_write_libtool_object ()
-+{
-+ write_libobj=${1}
-+ if test "$build_libtool_libs" = yes; then
-+ write_lobj=\'${2}\'
-+ else
-+ write_lobj=none
-+ fi
-+
-+ if test "$build_old_libs" = yes; then
-+ write_oldobj=\'${3}\'
-+ else
-+ write_oldobj=none
-+ fi
-+
-+ $opt_dry_run || {
-+ cat >${write_libobj}T <<EOF
-+# $write_libobj - a libtool object file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# Name of the PIC object.
-+pic_object=$write_lobj
-+
-+# Name of the non-PIC object
-+non_pic_object=$write_oldobj
-+
-+EOF
-+ mv -f "${write_libobj}T" "${write_libobj}"
-+ }
-+}
-+
-+# func_mode_compile arg...
-+func_mode_compile ()
-+{
-+ $opt_debug
-+ # Get the compilation command and the source file.
-+ base_compile=
-+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
-+ suppress_opt=yes
-+ suppress_output=
-+ arg_mode=normal
-+ libobj=
-+ later=
-+ pie_flag=
-+
-+ for arg
-+ do
-+ case $arg_mode in
-+ arg )
-+ # do not "continue". Instead, add this to base_compile
-+ lastarg="$arg"
-+ arg_mode=normal
-+ ;;
-+
-+ target )
-+ libobj="$arg"
-+ arg_mode=normal
-+ continue
-+ ;;
-+
-+ normal )
-+ # Accept any command-line options.
-+ case $arg in
-+ -o)
-+ test -n "$libobj" && \
-+ func_fatal_error "you cannot specify \`-o' more than once"
-+ arg_mode=target
-+ continue
-+ ;;
-+
-+ -pie | -fpie | -fPIE)
-+ pie_flag="$pie_flag $arg"
-+ continue
-+ ;;
-+
-+ -shared | -static | -prefer-pic | -prefer-non-pic)
-+ later="$later $arg"
-+ continue
-+ ;;
-+
-+ -no-suppress)
-+ suppress_opt=no
-+ continue
-+ ;;
-+
-+ -Xcompiler)
-+ arg_mode=arg # the next one goes into the "base_compile" arg list
-+ continue # The current "srcfile" will either be retained or
-+ ;; # replaced later. I would guess that would be a bug.
-+
-+ -Wc,*)
-+ func_stripname '-Wc,' '' "$arg"
-+ args=$func_stripname_result
-+ lastarg=
-+ save_ifs="$IFS"; IFS=','
-+ for arg in $args; do
-+ IFS="$save_ifs"
-+ func_quote_for_eval "$arg"
-+ lastarg="$lastarg $func_quote_for_eval_result"
-+ done
-+ IFS="$save_ifs"
-+ func_stripname ' ' '' "$lastarg"
-+ lastarg=$func_stripname_result
-+
-+ # Add the arguments to base_compile.
-+ base_compile="$base_compile $lastarg"
-+ continue
-+ ;;
-+
-+ *)
-+ # Accept the current argument as the source file.
-+ # The previous "srcfile" becomes the current argument.
-+ #
-+ lastarg="$srcfile"
-+ srcfile="$arg"
-+ ;;
-+ esac # case $arg
-+ ;;
-+ esac # case $arg_mode
-+
-+ # Aesthetically quote the previous argument.
-+ func_quote_for_eval "$lastarg"
-+ base_compile="$base_compile $func_quote_for_eval_result"
-+ done # for arg
-+
-+ case $arg_mode in
-+ arg)
-+ func_fatal_error "you must specify an argument for -Xcompile"
-+ ;;
-+ target)
-+ func_fatal_error "you must specify a target with \`-o'"
-+ ;;
-+ *)
-+ # Get the name of the library object.
-+ test -z "$libobj" && {
-+ func_basename "$srcfile"
-+ libobj="$func_basename_result"
-+ }
-+ ;;
-+ esac
-+
-+ # Recognize several different file suffixes.
-+ # If the user specifies -o file.o, it is replaced with file.lo
-+ xform='[cCFSifmso]'
-+ case $libobj in
-+ *.ada) xform=ada ;;
-+ *.adb) xform=adb ;;
-+ *.ads) xform=ads ;;
-+ *.asm) xform=asm ;;
-+ *.c++) xform=c++ ;;
-+ *.cc) xform=cc ;;
-+ *.ii) xform=ii ;;
-+ *.class) xform=class ;;
-+ *.cpp) xform=cpp ;;
-+ *.cxx) xform=cxx ;;
-+ *.[fF][09]?) xform='[fF][09].' ;;
-+ *.for) xform=for ;;
-+ *.java) xform=java ;;
-+ *.obj) xform=obj ;;
-+ esac
-+
-+ libobj=`$ECHO "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-+
-+ case $libobj in
-+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-+ *)
-+ func_fatal_error "cannot determine name of library object from \`$libobj'"
-+ ;;
-+ esac
-+
-+ func_infer_tag $base_compile
-+
-+ for arg in $later; do
-+ case $arg in
-+ -shared)
-+ test "$build_libtool_libs" != yes && \
-+ func_fatal_configuration "can not build a shared library"
-+ build_old_libs=no
-+ continue
-+ ;;
-+
-+ -static)
-+ build_libtool_libs=no
-+ build_old_libs=yes
-+ continue
-+ ;;
-+
-+ -prefer-pic)
-+ pic_mode=yes
-+ continue
-+ ;;
-+
-+ -prefer-non-pic)
-+ pic_mode=no
-+ continue
-+ ;;
-+ esac
-+ done
-+
-+ func_quote_for_eval "$libobj"
-+ test "X$libobj" != "X$func_quote_for_eval_result" \
-+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
-+ && func_warning "libobj name \`$libobj' may not contain shell special characters."
-+ func_basename "$obj"
-+ objname="$func_basename_result"
-+ func_dirname "$obj" "/" ""
-+ xdir="$func_dirname_result"
-+ lobj=${xdir}$objdir/$objname
-+
-+ test -z "$base_compile" && \
-+ func_fatal_help "you must specify a compilation command"
-+
-+ # Delete any leftover library objects.
-+ if test "$build_old_libs" = yes; then
-+ removelist="$obj $lobj $libobj ${libobj}T"
-+ else
-+ removelist="$lobj $libobj ${libobj}T"
-+ fi
-+
-+ $opt_dry_run || $RM $removelist
-+ trap "$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE" 1 2 15
-+
-+ # On Cygwin there's no "real" PIC flag so we must build both object types
-+ case $host_os in
-+ cygwin* | mingw* | pw32* | os2*)
-+ pic_mode=default
-+ ;;
-+ esac
-+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+ # non-PIC code in shared libraries is not supported
-+ pic_mode=default
-+ fi
-+
-+ # Calculate the filename of the output object if compiler does
-+ # not support -o with -c
-+ if test "$compiler_c_o" = no; then
-+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+ lockfile="$output_obj.lock"
-+ removelist="$removelist $output_obj $lockfile"
-+ trap "$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE" 1 2 15
-+ else
-+ output_obj=
-+ need_locks=no
-+ lockfile=
-+ fi
-+
-+ # Lock this critical section if it is needed
-+ # We use this script file to make the link, it avoids creating a new file
-+ if test "$need_locks" = yes; then
-+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-+ func_echo "Waiting for $lockfile to be removed"
-+ sleep 2
-+ done
-+ elif test "$need_locks" = warn; then
-+ if test -f "$lockfile"; then
-+ $ECHO "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+ $opt_dry_run || $RM $removelist
-+ exit $EXIT_FAILURE
-+ fi
-+ $ECHO "$srcfile" > "$lockfile"
-+ fi
-+
-+ if test -n "$fix_srcfile_path"; then
-+ eval srcfile=\"$fix_srcfile_path\"
-+ fi
-+ func_quote_for_eval "$srcfile"
-+ qsrcfile=$func_quote_for_eval_result
-+
-+ $opt_dry_run || $RM "$libobj" "${libobj}T"
-+
-+ # Only build a PIC object if we are building libtool libraries.
-+ if test "$build_libtool_libs" = yes; then
-+ # Without this assignment, base_compile gets emptied.
-+ fbsd_hideous_sh_bug=$base_compile
-+
-+ if test "$pic_mode" != no; then
-+ command="$base_compile $qsrcfile $pic_flag"
-+ else
-+ # Don't build PIC code
-+ command="$base_compile $qsrcfile"
-+ fi
-+
-+ func_mkdir_p "$xdir$objdir"
-+
-+ if test -z "$output_obj"; then
-+ # Place PIC objects in $objdir
-+ command="$command -o $lobj"
-+ fi
-+
-+ $opt_dry_run || $RM "$lobj" "$output_obj"
-+
-+ func_show_eval "$command" \
-+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-+
-+ if test "$need_locks" = warn &&
-+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+ $ECHO "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+ $opt_dry_run || $RM $removelist
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ # Just move the object if needed, then go on to compile the next one
-+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-+ func_show_eval '$MV "$output_obj" "$lobj"' \
-+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-+ fi
-+
-+ # Allow error messages only from the first compilation.
-+ if test "$suppress_opt" = yes; then
-+ suppress_output=' >/dev/null 2>&1'
-+ fi
-+ fi
-+
-+ # Only build a position-dependent object if we build old libraries.
-+ if test "$build_old_libs" = yes; then
-+ if test "$pic_mode" != yes; then
-+ # Don't build PIC code
-+ command="$base_compile $qsrcfile$pie_flag"
-+ else
-+ command="$base_compile $qsrcfile $pic_flag"
-+ fi
-+ if test "$compiler_c_o" = yes; then
-+ command="$command -o $obj"
-+ fi
-+
-+ # Suppress compiler output if we already did a PIC compilation.
-+ command="$command$suppress_output"
-+ $opt_dry_run || $RM "$obj" "$output_obj"
-+ func_show_eval "$command" \
-+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-+
-+ if test "$need_locks" = warn &&
-+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+ $ECHO "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+ $opt_dry_run || $RM $removelist
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ # Just move the object if needed
-+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-+ func_show_eval '$MV "$output_obj" "$obj"' \
-+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-+ fi
-+ fi
-+
-+ $opt_dry_run || {
-+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-+
-+ # Unlock the critical section if it was locked
-+ if test "$need_locks" != no; then
-+ $RM "$lockfile"
-+ fi
-+ }
-+
-+ exit $EXIT_SUCCESS
-+}
-+
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
-+
-+
-+# func_mode_execute arg...
-+func_mode_execute ()
-+{
-+ $opt_debug
-+ # The first argument is the command name.
-+ cmd="$nonopt"
-+ test -z "$cmd" && \
-+ func_fatal_help "you must specify a COMMAND"
-+
-+ # Handle -dlopen flags immediately.
-+ for file in $execute_dlfiles; do
-+ test -f "$file" \
-+ || func_fatal_help "\`$file' is not a file"
-+
-+ dir=
-+ case $file in
-+ *.la)
-+ # Check to see that this really is a libtool archive.
-+ func_lalib_unsafe_p "$file" \
-+ || func_fatal_help "\`$lib' is not a valid libtool archive"
-+
-+ # Read the libtool library.
-+ dlname=
-+ library_names=
-+ func_source "$file"
-+
-+ # Skip this library if it cannot be dlopened.
-+ if test -z "$dlname"; then
-+ # Warn if it was a shared library.
-+ test -n "$library_names" && \
-+ func_warning "\`$file' was not linked with \`-export-dynamic'"
-+ continue
-+ fi
-+
-+ func_dirname "$file" "" "."
-+ dir="$func_dirname_result"
-+
-+ if test -f "$dir/$objdir/$dlname"; then
-+ dir="$dir/$objdir"
-+ else
-+ if test ! -f "$dir/$dlname"; then
-+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-+ fi
-+ fi
-+ ;;
-+
-+ *.lo)
-+ # Just add the directory containing the .lo file.
-+ func_dirname "$file" "" "."
-+ dir="$func_dirname_result"
-+ ;;
-+
-+ *)
-+ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-+ continue
-+ ;;
-+ esac
-+
-+ # Get the absolute pathname.
-+ absdir=`cd "$dir" && pwd`
-+ test -n "$absdir" && dir="$absdir"
-+
-+ # Now add the directory to shlibpath_var.
-+ if eval "test -z \"\$$shlibpath_var\""; then
-+ eval "$shlibpath_var=\"\$dir\""
-+ else
-+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+ fi
-+ done
-+
-+ # This variable tells wrapper scripts just to set shlibpath_var
-+ # rather than running their programs.
-+ libtool_execute_magic="$magic"
-+
-+ # Check if any of the arguments is a wrapper script.
-+ args=
-+ for file
-+ do
-+ case $file in
-+ -*) ;;
-+ *)
-+ # Do a test to see if this is really a libtool program.
-+ if func_ltwrapper_p "$file"; then
-+ func_source "$file"
-+
-+ # Transform arg to wrapped name.
-+ file="$progdir/$program"
-+ fi
-+ ;;
-+ esac
-+ # Quote arguments (to preserve shell metacharacters).
-+ func_quote_for_eval "$file"
-+ args="$args $func_quote_for_eval_result"
-+ done
-+
-+ if test "X$opt_dry_run" = Xfalse; then
-+ if test -n "$shlibpath_var"; then
-+ # Export the shlibpath_var.
-+ eval "export $shlibpath_var"
-+ fi
-+
-+ # Restore saved environment variables
-+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ else
-+ $lt_unset $lt_var
-+ fi"
-+ done
-+
-+ # Now prepare to actually exec the command.
-+ exec_cmd="\$cmd$args"
-+ else
-+ # Display what would be done.
-+ if test -n "$shlibpath_var"; then
-+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-+ $ECHO "export $shlibpath_var"
-+ fi
-+ $ECHO "$cmd$args"
-+ exit $EXIT_SUCCESS
-+ fi
-+}
-+
-+test "$mode" = execute && func_mode_execute ${1+"$@"}
-+
-+
-+# func_mode_finish arg...
-+func_mode_finish ()
-+{
-+ $opt_debug
-+ libdirs="$nonopt"
-+ admincmds=
-+
-+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+ for dir
-+ do
-+ libdirs="$libdirs $dir"
-+ done
-+
-+ for libdir in $libdirs; do
-+ if test -n "$finish_cmds"; then
-+ # Do each command in the finish commands.
-+ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-+'"$cmd"'"'
-+ fi
-+ if test -n "$finish_eval"; then
-+ # Do the single finish_eval.
-+ eval cmds=\"$finish_eval\"
-+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+ $cmds"
-+ fi
-+ done
-+ fi
-+
-+ # Exit here if they wanted silent mode.
-+ $opt_silent && exit $EXIT_SUCCESS
-+
-+ $ECHO "X----------------------------------------------------------------------" | $Xsed
-+ $ECHO "Libraries have been installed in:"
-+ for libdir in $libdirs; do
-+ $ECHO " $libdir"
-+ done
-+ $ECHO
-+ $ECHO "If you ever happen to want to link against installed libraries"
-+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+ $ECHO "flag during linking and do at least one of the following:"
-+ if test -n "$shlibpath_var"; then
-+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
-+ $ECHO " during execution"
-+ fi
-+ if test -n "$runpath_var"; then
-+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
-+ $ECHO " during linking"
-+ fi
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ libdir=LIBDIR
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+
-+ $ECHO " - use the \`$flag' linker flag"
-+ fi
-+ if test -n "$admincmds"; then
-+ $ECHO " - have your system administrator run these commands:$admincmds"
-+ fi
-+ if test -f /etc/ld.so.conf; then
-+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+ fi
-+ $ECHO
-+
-+ $ECHO "See any operating system documentation about shared libraries for"
-+ case $host in
-+ solaris2.[6789]|solaris2.1[0-9])
-+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+ $ECHO "pages."
-+ ;;
-+ *)
-+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-+ ;;
-+ esac
-+ $ECHO "X----------------------------------------------------------------------" | $Xsed
-+ exit $EXIT_SUCCESS
-+}
-+
-+test "$mode" = finish && func_mode_finish ${1+"$@"}
-+
-+
-+# func_mode_install arg...
-+func_mode_install ()
-+{
-+ $opt_debug
-+ # There may be an optional sh(1) argument at the beginning of
-+ # install_prog (especially on Windows NT).
-+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+ # Allow the use of GNU shtool's install command.
-+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+ # Aesthetically quote it.
-+ func_quote_for_eval "$nonopt"
-+ install_prog="$func_quote_for_eval_result "
-+ arg=$1
-+ shift
-+ else
-+ install_prog=
-+ arg=$nonopt
-+ fi
-+
-+ # The real first argument should be the name of the installation program.
-+ # Aesthetically quote it.
-+ func_quote_for_eval "$arg"
-+ install_prog="$install_prog$func_quote_for_eval_result"
-+
-+ # We need to accept at least all the BSD install flags.
-+ dest=
-+ files=
-+ opts=
-+ prev=
-+ install_type=
-+ isdir=no
-+ stripme=
-+ for arg
-+ do
-+ if test -n "$dest"; then
-+ files="$files $dest"
-+ dest=$arg
-+ continue
-+ fi
-+
-+ case $arg in
-+ -d) isdir=yes ;;
-+ -f)
-+ case " $install_prog " in
-+ *[\\\ /]cp\ *) ;;
-+ *) prev=$arg ;;
-+ esac
-+ ;;
-+ -g | -m | -o)
-+ prev=$arg
-+ ;;
-+ -s)
-+ stripme=" -s"
-+ continue
-+ ;;
-+ -*)
-+ ;;
-+ *)
-+ # If the previous option needed an argument, then skip it.
-+ if test -n "$prev"; then
-+ prev=
-+ else
-+ dest=$arg
-+ continue
-+ fi
-+ ;;
-+ esac
-+
-+ # Aesthetically quote the argument.
-+ func_quote_for_eval "$arg"
-+ install_prog="$install_prog $func_quote_for_eval_result"
-+ done
-+
-+ test -z "$install_prog" && \
-+ func_fatal_help "you must specify an install program"
-+
-+ test -n "$prev" && \
-+ func_fatal_help "the \`$prev' option requires an argument"
-+
-+ if test -z "$files"; then
-+ if test -z "$dest"; then
-+ func_fatal_help "no file or destination specified"
-+ else
-+ func_fatal_help "you must specify a destination"
-+ fi
-+ fi
-+
-+ # Strip any trailing slash from the destination.
-+ func_stripname '' '/' "$dest"
-+ dest=$func_stripname_result
-+
-+ # Check to see that the destination is a directory.
-+ test -d "$dest" && isdir=yes
-+ if test "$isdir" = yes; then
-+ destdir="$dest"
-+ destname=
-+ else
-+ func_dirname "$dest" "" "."
-+ destdir="$func_dirname_result"
-+ func_basename "$dest"
-+ destname="$func_basename_result"
-+
-+ # Not a directory, so check to see that there is only one file specified.
-+ set dummy $files; shift
-+ test "$#" -gt 1 && \
-+ func_fatal_help "\`$dest' is not a directory"
-+ fi
-+ case $destdir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ for file in $files; do
-+ case $file in
-+ *.lo) ;;
-+ *)
-+ func_fatal_help "\`$destdir' must be an absolute directory name"
-+ ;;
-+ esac
-+ done
-+ ;;
-+ esac
-+
-+ # This variable tells wrapper scripts just to set variables rather
-+ # than running their programs.
-+ libtool_install_magic="$magic"
-+
-+ staticlibs=
-+ future_libdirs=
-+ current_libdirs=
-+ for file in $files; do
-+
-+ # Do each installation.
-+ case $file in
-+ *.$libext)
-+ # Do the static libraries later.
-+ staticlibs="$staticlibs $file"
-+ ;;
-+
-+ *.la)
-+ # Check to see that this really is a libtool archive.
-+ func_lalib_unsafe_p "$file" \
-+ || func_fatal_help "\`$file' is not a valid libtool archive"
-+
-+ library_names=
-+ old_library=
-+ relink_command=
-+ func_source "$file"
-+
-+ # Add the libdir to current_libdirs if it is the destination.
-+ if test "X$destdir" = "X$libdir"; then
-+ case "$current_libdirs " in
-+ *" $libdir "*) ;;
-+ *) current_libdirs="$current_libdirs $libdir" ;;
-+ esac
-+ else
-+ # Note the libdir as a future libdir.
-+ case "$future_libdirs " in
-+ *" $libdir "*) ;;
-+ *) future_libdirs="$future_libdirs $libdir" ;;
-+ esac
-+ fi
-+
-+ func_dirname "$file" "/" ""
-+ dir="$func_dirname_result"
-+ dir="$dir$objdir"
-+
-+ if test -n "$relink_command"; then
-+ # Determine the prefix the user has applied to our future dir.
-+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+
-+ # Don't allow the user to place us outside of our expected
-+ # location b/c this prevents finding dependent libraries that
-+ # are installed to the same prefix.
-+ # At present, this check doesn't affect windows .dll's that
-+ # are installed into $libdir/../bin (currently, that works fine)
-+ # but it's something to keep an eye on.
-+ test "$inst_prefix_dir" = "$destdir" && \
-+ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+
-+ if test -n "$inst_prefix_dir"; then
-+ # Stick the inst_prefix_dir data into the link command.
-+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ else
-+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+ fi
-+
-+ func_warning "relinking \`$file'"
-+ func_show_eval "$relink_command" \
-+ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-+ fi
-+
-+ # See the names of the shared library.
-+ set dummy $library_names; shift
-+ if test -n "$1"; then
-+ realname="$1"
-+ shift
-+
-+ srcname="$realname"
-+ test -n "$relink_command" && srcname="$realname"T
-+
-+ # Install the shared library and build the symlinks.
-+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-+ 'exit $?'
-+ tstripme="$stripme"
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ case $realname in
-+ *.dll.a)
-+ tstripme=""
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ if test -n "$tstripme" && test -n "$striplib"; then
-+ func_show_eval "$striplib $destdir/$realname" 'exit $?'
-+ fi
-+
-+ if test "$#" -gt 0; then
-+ # Delete the old symlinks, and create new ones.
-+ # Try `ln -sf' first, because the `ln' binary might depend on
-+ # the symlink we replace! Solaris /bin/ln does not understand -f,
-+ # so we also need to try rm && ln -s.
-+ for linkname
-+ do
-+ test "$linkname" != "$realname" \
-+ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-+ done
-+ fi
-+
-+ # Do each command in the postinstall commands.
-+ lib="$destdir/$realname"
-+ func_execute_cmds "$postinstall_cmds" 'exit $?'
-+ fi
-+
-+ # Install the pseudo-library for information purposes.
-+ func_basename "$file"
-+ name="$func_basename_result"
-+ instname="$dir/$name"i
-+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+
-+ # Maybe install the static library, too.
-+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+ ;;
-+
-+ *.lo)
-+ # Install (i.e. copy) a libtool object.
-+
-+ # Figure out destination file name, if it wasn't already specified.
-+ if test -n "$destname"; then
-+ destfile="$destdir/$destname"
-+ else
-+ func_basename "$file"
-+ destfile="$func_basename_result"
-+ destfile="$destdir/$destfile"
-+ fi
-+
-+ # Deduce the name of the destination old-style object file.
-+ case $destfile in
-+ *.lo)
-+ func_lo2o "$destfile"
-+ staticdest=$func_lo2o_result
-+ ;;
-+ *.$objext)
-+ staticdest="$destfile"
-+ destfile=
-+ ;;
-+ *)
-+ func_fatal_help "cannot copy a libtool object to \`$destfile'"
-+ ;;
-+ esac
-+
-+ # Install the libtool object if requested.
-+ test -n "$destfile" && \
-+ func_show_eval "$install_prog $file $destfile" 'exit $?'
-+
-+ # Install the old object if enabled.
-+ if test "$build_old_libs" = yes; then
-+ # Deduce the name of the old-style object file.
-+ func_lo2o "$file"
-+ staticobj=$func_lo2o_result
-+ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-+ fi
-+ exit $EXIT_SUCCESS
-+ ;;
-+
-+ *)
-+ # Figure out destination file name, if it wasn't already specified.
-+ if test -n "$destname"; then
-+ destfile="$destdir/$destname"
-+ else
-+ func_basename "$file"
-+ destfile="$func_basename_result"
-+ destfile="$destdir/$destfile"
-+ fi
-+
-+ # If the file is missing, and there is a .exe on the end, strip it
-+ # because it is most likely a libtool script we actually want to
-+ # install
-+ stripped_ext=""
-+ case $file in
-+ *.exe)
-+ if test ! -f "$file"; then
-+ func_stripname '' '.exe' "$file"
-+ file=$func_stripname_result
-+ stripped_ext=".exe"
-+ fi
-+ ;;
-+ esac
-+
-+ # Do a test to see if this is really a libtool program.
-+ case $host in
-+ *cygwin*|*mingw*)
-+ func_stripname '' '.exe' "$file"
-+ wrapper=$func_stripname_result
-+ ;;
-+ *)
-+ wrapper=$file
-+ ;;
-+ esac
-+ if func_ltwrapper_p "$wrapper"; then
-+ notinst_deplibs=
-+ relink_command=
-+
-+ func_source "$wrapper"
-+
-+ # Check the variables that should have been set.
-+ test -z "$generated_by_libtool_version" && \
-+ func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-+
-+ finalize=yes
-+ for lib in $notinst_deplibs; do
-+ # Check to see that each library is installed.
-+ libdir=
-+ if test -f "$lib"; then
-+ func_source "$lib"
-+ fi
-+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+ if test -n "$libdir" && test ! -f "$libfile"; then
-+ func_warning "\`$lib' has not been installed in \`$libdir'"
-+ finalize=no
-+ fi
-+ done
-+
-+ relink_command=
-+ func_source "$wrapper"
-+
-+ outputname=
-+ if test "$fast_install" = no && test -n "$relink_command"; then
-+ $opt_dry_run || {
-+ if test "$finalize" = yes; then
-+ tmpdir=`func_mktempdir`
-+ func_basename "$file$stripped_ext"
-+ file="$func_basename_result"
-+ outputname="$tmpdir/$file"
-+ # Replace the output file specification.
-+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+ $opt_silent || {
-+ func_quote_for_expand "$relink_command"
-+ eval "func_echo $func_quote_for_expand_result"
-+ }
-+ if eval "$relink_command"; then :
-+ else
-+ func_error "error: relink \`$file' with the above command before installing it"
-+ $opt_dry_run || ${RM}r "$tmpdir"
-+ continue
-+ fi
-+ file="$outputname"
-+ else
-+ func_warning "cannot relink \`$file'"
-+ fi
-+ }
-+ else
-+ # Install the binary that we compiled earlier.
-+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+ fi
-+ fi
-+
-+ # remove .exe since cygwin /usr/bin/install will append another
-+ # one anyway
-+ case $install_prog,$host in
-+ */usr/bin/install*,*cygwin*)
-+ case $file:$destfile in
-+ *.exe:*.exe)
-+ # this is ok
-+ ;;
-+ *.exe:*)
-+ destfile=$destfile.exe
-+ ;;
-+ *:*.exe)
-+ func_stripname '' '.exe' "$destfile"
-+ destfile=$func_stripname_result
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-+ $opt_dry_run || if test -n "$outputname"; then
-+ ${RM}r "$tmpdir"
-+ fi
-+ ;;
-+ esac
-+ done
-+
-+ for file in $staticlibs; do
-+ func_basename "$file"
-+ name="$func_basename_result"
-+
-+ # Set up the ranlib parameters.
-+ oldlib="$destdir/$name"
-+
-+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-+
-+ if test -n "$stripme" && test -n "$old_striplib"; then
-+ func_show_eval "$old_striplib $oldlib" 'exit $?'
-+ fi
-+
-+ # Do each command in the postinstall commands.
-+ func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-+ done
-+
-+ test -n "$future_libdirs" && \
-+ func_warning "remember to run \`$progname --finish$future_libdirs'"
-+
-+ if test -n "$current_libdirs"; then
-+ # Maybe just do a dry run.
-+ $opt_dry_run && current_libdirs=" -n$current_libdirs"
-+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-+ else
-+ exit $EXIT_SUCCESS
-+ fi
-+}
-+
-+test "$mode" = install && func_mode_install ${1+"$@"}
-+
-+
-+# func_mode_link arg...
-+func_mode_link ()
-+{
-+ $opt_debug
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ # It is impossible to link a dll without this setting, and
-+ # we shouldn't force the makefile maintainer to figure out
-+ # which system we are compiling for in order to pass an extra
-+ # flag for every libtool invocation.
-+ # allow_undefined=no
-+
-+ # FIXME: Unfortunately, there are problems with the above when trying
-+ # to make a dll which has undefined symbols, in which case not
-+ # even a static library is built. For now, we need to specify
-+ # -no-undefined on the libtool link line when we can be certain
-+ # that all symbols are satisfied, otherwise we get a static library.
-+ allow_undefined=yes
-+ ;;
-+ *)
-+ allow_undefined=yes
-+ ;;
-+ esac
-+ libtool_args=$nonopt
-+ base_compile="$nonopt $@"
-+ compile_command=$nonopt
-+ finalize_command=$nonopt
-+
-+ compile_rpath=
-+ finalize_rpath=
-+ compile_shlibpath=
-+ finalize_shlibpath=
-+ convenience=
-+ old_convenience=
-+ deplibs=
-+ old_deplibs=
-+ compiler_flags=
-+ linker_flags=
-+ dllsearchpath=
-+ lib_search_path=`pwd`
-+ inst_prefix_dir=
-+ new_inherited_linker_flags=
-+
-+ avoid_version=no
-+ dlfiles=
-+ dlprefiles=
-+ dlself=no
-+ export_dynamic=no
-+ export_symbols=
-+ export_symbols_regex=
-+ generated=
-+ libobjs=
-+ ltlibs=
-+ module=no
-+ no_install=no
-+ objs=
-+ non_pic_objects=
-+ precious_files_regex=
-+ prefer_static_libs=no
-+ preload=no
-+ prev=
-+ prevarg=
-+ release=
-+ rpath=
-+ xrpath=
-+ perm_rpath=
-+ temp_rpath=
-+ thread_safe=no
-+ vinfo=
-+ vinfo_number=no
-+ weak_libs=
-+ single_module="${wl}-single_module"
-+ func_infer_tag $base_compile
-+
-+ # We need to know -static, to get the right output filenames.
-+ for arg
-+ do
-+ case $arg in
-+ -shared)
-+ test "$build_libtool_libs" != yes && \
-+ func_fatal_configuration "can not build a shared library"
-+ build_old_libs=no
-+ break
-+ ;;
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
-+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+ func_warning "complete static linking is impossible in this configuration"
-+ fi
-+ if test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ # See comment for -static flag below, for more details.
-+ func_append compile_command " $link_static_flag"
-+ func_append finalize_command " $link_static_flag"
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ -static)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=built
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
-+ build_libtool_libs=no
-+ build_old_libs=yes
-+ break
-+ ;;
-+ esac
-+ done
-+
-+ # See if our shared archives depend on static archives.
-+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+
-+ # Go through the arguments, transforming them on the way.
-+ while test "$#" -gt 0; do
-+ arg="$1"
-+ shift
-+ func_quote_for_eval "$arg"
-+ qarg=$func_quote_for_eval_unquoted_result
-+ func_append libtool_args " $func_quote_for_eval_result"
-+
-+ # If the previous option needs an argument, assign it.
-+ if test -n "$prev"; then
-+ case $prev in
-+ output)
-+ func_append compile_command " @OUTPUT@"
-+ func_append finalize_command " @OUTPUT@"
-+ ;;
-+ esac
-+
-+ case $prev in
-+ dlfiles|dlprefiles)
-+ if test "$preload" = no; then
-+ # Add the symbol object into the linking commands.
-+ func_append compile_command " @SYMFILE@"
-+ func_append finalize_command " @SYMFILE@"
-+ preload=yes
-+ fi
-+ case $arg in
-+ *.la | *.lo) ;; # We handle these cases below.
-+ force)
-+ if test "$dlself" = no; then
-+ dlself=needless
-+ export_dynamic=yes
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ self)
-+ if test "$prev" = dlprefiles; then
-+ dlself=yes
-+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+ dlself=yes
-+ else
-+ dlself=needless
-+ export_dynamic=yes
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ *)
-+ if test "$prev" = dlfiles; then
-+ dlfiles="$dlfiles $arg"
-+ else
-+ dlprefiles="$dlprefiles $arg"
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ esac
-+ ;;
-+ expsyms)
-+ export_symbols="$arg"
-+ test -f "$arg" \
-+ || func_fatal_error "symbol file \`$arg' does not exist"
-+ prev=
-+ continue
-+ ;;
-+ expsyms_regex)
-+ export_symbols_regex="$arg"
-+ prev=
-+ continue
-+ ;;
-+ framework)
-+ case $host in
-+ *-*-darwin*)
-+ case "$deplibs " in
-+ *" $qarg.ltframework "*) ;;
-+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ prev=
-+ continue
-+ ;;
-+ inst_prefix)
-+ inst_prefix_dir="$arg"
-+ prev=
-+ continue
-+ ;;
-+ objectlist)
-+ if test -f "$arg"; then
-+ save_arg=$arg
-+ moreargs=
-+ for fil in `cat "$save_arg"`
-+ do
-+# moreargs="$moreargs $fil"
-+ arg=$fil
-+ # A libtool-controlled object.
-+
-+ # Check to see that this really is a libtool object.
-+ if func_lalib_unsafe_p "$arg"; then
-+ pic_object=
-+ non_pic_object=
-+
-+ # Read the .lo file
-+ func_source "$arg"
-+
-+ if test -z "$pic_object" ||
-+ test -z "$non_pic_object" ||
-+ test "$pic_object" = none &&
-+ test "$non_pic_object" = none; then
-+ func_fatal_error "cannot find name of object for \`$arg'"
-+ fi
-+
-+ # Extract subdirectory from the argument.
-+ func_dirname "$arg" "/" ""
-+ xdir="$func_dirname_result"
-+
-+ if test "$pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ pic_object="$xdir$pic_object"
-+
-+ if test "$prev" = dlfiles; then
-+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+ dlfiles="$dlfiles $pic_object"
-+ prev=
-+ continue
-+ else
-+ # If libtool objects are unsupported, then we need to preload.
-+ prev=dlprefiles
-+ fi
-+ fi
-+
-+ # CHECK ME: I think I busted this. -Ossama
-+ if test "$prev" = dlprefiles; then
-+ # Preload the old-style object.
-+ dlprefiles="$dlprefiles $pic_object"
-+ prev=
-+ fi
-+
-+ # A PIC object.
-+ func_append libobjs " $pic_object"
-+ arg="$pic_object"
-+ fi
-+
-+ # Non-PIC object.
-+ if test "$non_pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ non_pic_object="$xdir$non_pic_object"
-+
-+ # A standard non-PIC object
-+ func_append non_pic_objects " $non_pic_object"
-+ if test -z "$pic_object" || test "$pic_object" = none ; then
-+ arg="$non_pic_object"
-+ fi
-+ else
-+ # If the PIC object exists, use it instead.
-+ # $xdir was prepended to $pic_object above.
-+ non_pic_object="$pic_object"
-+ func_append non_pic_objects " $non_pic_object"
-+ fi
-+ else
-+ # Only an error if not doing a dry-run.
-+ if $opt_dry_run; then
-+ # Extract subdirectory from the argument.
-+ func_dirname "$arg" "/" ""
-+ xdir="$func_dirname_result"
-+
-+ func_lo2o "$arg"
-+ pic_object=$xdir$objdir/$func_lo2o_result
-+ non_pic_object=$xdir$func_lo2o_result
-+ func_append libobjs " $pic_object"
-+ func_append non_pic_objects " $non_pic_object"
-+ else
-+ func_fatal_error "\`$arg' is not a valid libtool object"
-+ fi
-+ fi
-+ done
-+ else
-+ func_fatal_error "link input file \`$arg' does not exist"
-+ fi
-+ arg=$save_arg
-+ prev=
-+ continue
-+ ;;
-+ precious_regex)
-+ precious_files_regex="$arg"
-+ prev=
-+ continue
-+ ;;
-+ release)
-+ release="-$arg"
-+ prev=
-+ continue
-+ ;;
-+ rpath | xrpath)
-+ # We need an absolute path.
-+ case $arg in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ func_fatal_error "only absolute run-paths are allowed"
-+ ;;
-+ esac
-+ if test "$prev" = rpath; then
-+ case "$rpath " in
-+ *" $arg "*) ;;
-+ *) rpath="$rpath $arg" ;;
-+ esac
-+ else
-+ case "$xrpath " in
-+ *" $arg "*) ;;
-+ *) xrpath="$xrpath $arg" ;;
-+ esac
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ shrext)
-+ shrext_cmds="$arg"
-+ prev=
-+ continue
-+ ;;
-+ weak)
-+ weak_libs="$weak_libs $arg"
-+ prev=
-+ continue
-+ ;;
-+ xcclinker)
-+ linker_flags="$linker_flags $qarg"
-+ compiler_flags="$compiler_flags $qarg"
-+ prev=
-+ func_append compile_command " $qarg"
-+ func_append finalize_command " $qarg"
-+ continue
-+ ;;
-+ xcompiler)
-+ compiler_flags="$compiler_flags $qarg"
-+ prev=
-+ func_append compile_command " $qarg"
-+ func_append finalize_command " $qarg"
-+ continue
-+ ;;
-+ xlinker)
-+ linker_flags="$linker_flags $qarg"
-+ compiler_flags="$compiler_flags $wl$qarg"
-+ prev=
-+ func_append compile_command " $wl$qarg"
-+ func_append finalize_command " $wl$qarg"
-+ continue
-+ ;;
-+ *)
-+ eval "$prev=\"\$arg\""
-+ prev=
-+ continue
-+ ;;
-+ esac
-+ fi # test -n "$prev"
-+
-+ prevarg="$arg"
-+
-+ case $arg in
-+ -all-static)
-+ # The effects of -all-static are defined in a previous loop.
-+ continue
-+ ;;
-+
-+ -allow-undefined)
-+ # FIXME: remove this flag sometime in the future.
-+ func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-+ ;;
-+
-+ -avoid-version)
-+ avoid_version=yes
-+ continue
-+ ;;
-+
-+ -dlopen)
-+ prev=dlfiles
-+ continue
-+ ;;
-+
-+ -dlpreopen)
-+ prev=dlprefiles
-+ continue
-+ ;;
-+
-+ -export-dynamic)
-+ export_dynamic=yes
-+ continue
-+ ;;
-+
-+ -export-symbols | -export-symbols-regex)
-+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+ func_fatal_error "more than one -exported-symbols argument is not allowed"
-+ fi
-+ if test "X$arg" = "X-export-symbols"; then
-+ prev=expsyms
-+ else
-+ prev=expsyms_regex
-+ fi
-+ continue
-+ ;;
-+
-+ -framework)
-+ prev=framework
-+ continue
-+ ;;
-+
-+ -inst-prefix-dir)
-+ prev=inst_prefix
-+ continue
-+ ;;
-+
-+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+ # so, if we see these flags be careful not to treat them like -L
-+ -L[A-Z][A-Z]*:*)
-+ case $with_gcc/$host in
-+ no/*-*-irix* | /*-*-irix*)
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ ;;
-+ esac
-+ continue
-+ ;;
-+
-+ -L*)
-+ func_stripname '-L' '' "$arg"
-+ dir=$func_stripname_result
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ absdir=`cd "$dir" && pwd`
-+ test -z "$absdir" && \
-+ func_fatal_error "cannot determine absolute directory name of \`$dir'"
-+ dir="$absdir"
-+ ;;
-+ esac
-+ case "$deplibs " in
-+ *" -L$dir "*) ;;
-+ *)
-+ deplibs="$deplibs -L$dir"
-+ lib_search_path="$lib_search_path $dir"
-+ ;;
-+ esac
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+ case :$dllsearchpath: in
-+ *":$dir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$dir";;
-+ esac
-+ case :$dllsearchpath: in
-+ *":$testbindir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$testbindir";;
-+ esac
-+ ;;
-+ esac
-+ continue
-+ ;;
-+
-+ -l*)
-+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-+ # These systems don't actually have a C or math library (as such)
-+ continue
-+ ;;
-+ *-*-os2*)
-+ # These systems don't actually have a C library (as such)
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # Rhapsody C and math libraries are in the System framework
-+ deplibs="$deplibs System.ltframework"
-+ continue
-+ ;;
-+ *-*-sco3.2v5* | *-*-sco5v6*)
-+ # Causes problems with __ctype
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+ # Compiler inserts libc in the correct place for threads to work
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ esac
-+ elif test "X$arg" = "X-lc_r"; then
-+ case $host in
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+ ;;
-+ esac
-+ fi
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
-+ -module)
-+ module=yes
-+ continue
-+ ;;
-+
-+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+ # classes, name mangling, and exception handling.
-+ # Darwin uses the -arch flag to determine output architecture.
-+ -model|-arch|-isysroot)
-+ compiler_flags="$compiler_flags $arg"
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ prev=xcompiler
-+ continue
-+ ;;
-+
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+ compiler_flags="$compiler_flags $arg"
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ case "$new_inherited_linker_flags " in
-+ *" $arg "*) ;;
-+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+ esac
-+ continue
-+ ;;
-+
-+ -multi_module)
-+ single_module="${wl}-multi_module"
-+ continue
-+ ;;
-+
-+ -no-fast-install)
-+ fast_install=no
-+ continue
-+ ;;
-+
-+ -no-install)
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ # The PATH hackery in wrapper scripts is required on Windows
-+ # in order for the loader to find any dlls it needs.
-+ func_warning "\`-no-install' is ignored for $host"
-+ func_warning "assuming \`-no-fast-install' instead"
-+ fast_install=no
-+ ;;
-+ *) no_install=yes ;;
-+ esac
-+ continue
-+ ;;
-+
-+ -no-undefined)
-+ allow_undefined=no
-+ continue
-+ ;;
-+
-+ -objectlist)
-+ prev=objectlist
-+ continue
-+ ;;
-+
-+ -o) prev=output ;;
-+
-+ -precious-files-regex)
-+ prev=precious_regex
-+ continue
-+ ;;
-+
-+ -release)
-+ prev=release
-+ continue
-+ ;;
-+
-+ -rpath)
-+ prev=rpath
-+ continue
-+ ;;
-+
-+ -R)
-+ prev=xrpath
-+ continue
-+ ;;
-+
-+ -R*)
-+ func_stripname '-R' '' "$arg"
-+ dir=$func_stripname_result
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ func_fatal_error "only absolute run-paths are allowed"
-+ ;;
-+ esac
-+ case "$xrpath " in
-+ *" $dir "*) ;;
-+ *) xrpath="$xrpath $dir" ;;
-+ esac
-+ continue
-+ ;;
-+
-+ -shared)
-+ # The effects of -shared are defined in a previous loop.
-+ continue
-+ ;;
-+
-+ -shrext)
-+ prev=shrext
-+ continue
-+ ;;
-+
-+ -static | -static-libtool-libs)
-+ # The effects of -static are defined in a previous loop.
-+ # We used to do the same as -all-static on platforms that
-+ # didn't have a PIC flag, but the assumption that the effects
-+ # would be equivalent was wrong. It would break on at least
-+ # Digital Unix and AIX.
-+ continue
-+ ;;
-+
-+ -thread-safe)
-+ thread_safe=yes
-+ continue
-+ ;;
-+
-+ -version-info)
-+ prev=vinfo
-+ continue
-+ ;;
-+
-+ -version-number)
-+ prev=vinfo
-+ vinfo_number=yes
-+ continue
-+ ;;
-+
-+ -weak)
-+ prev=weak
-+ continue
-+ ;;
-+
-+ -Wc,*)
-+ func_stripname '-Wc,' '' "$arg"
-+ args=$func_stripname_result
-+ arg=
-+ save_ifs="$IFS"; IFS=','
-+ for flag in $args; do
-+ IFS="$save_ifs"
-+ func_quote_for_eval "$flag"
-+ arg="$arg $wl$func_quote_for_eval_result"
-+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+ done
-+ IFS="$save_ifs"
-+ func_stripname ' ' '' "$arg"
-+ arg=$func_stripname_result
-+ ;;
-+
-+ -Wl,*)
-+ func_stripname '-Wl,' '' "$arg"
-+ args=$func_stripname_result
-+ arg=
-+ save_ifs="$IFS"; IFS=','
-+ for flag in $args; do
-+ IFS="$save_ifs"
-+ func_quote_for_eval "$flag"
-+ arg="$arg $wl$func_quote_for_eval_result"
-+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-+ linker_flags="$linker_flags $func_quote_for_eval_result"
-+ done
-+ IFS="$save_ifs"
-+ func_stripname ' ' '' "$arg"
-+ arg=$func_stripname_result
-+ ;;
-+
-+ -Xcompiler)
-+ prev=xcompiler
-+ continue
-+ ;;
-+
-+ -Xlinker)
-+ prev=xlinker
-+ continue
-+ ;;
-+
-+ -XCClinker)
-+ prev=xcclinker
-+ continue
-+ ;;
-+
-+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+ # +DA*, +DD* enable 64-bit mode on the HP compiler
-+ # -q* pass through compiler args for the IBM compiler
-+ # -m*, -t[45]*, -txscale* pass through architecture-specific
-+ # compiler args for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # @file GCC response files
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ func_quote_for_eval "$arg"
-+ arg="$func_quote_for_eval_result"
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ compiler_flags="$compiler_flags $arg"
-+ continue
-+ ;;
-+
-+ # Some other compiler flag.
-+ -* | +*)
-+ func_quote_for_eval "$arg"
-+ arg="$func_quote_for_eval_result"
-+ ;;
-+
-+ *.$objext)
-+ # A standard object.
-+ objs="$objs $arg"
-+ ;;
-+
-+ *.lo)
-+ # A libtool-controlled object.
-+
-+ # Check to see that this really is a libtool object.
-+ if func_lalib_unsafe_p "$arg"; then
-+ pic_object=
-+ non_pic_object=
-+
-+ # Read the .lo file
-+ func_source "$arg"
-+
-+ if test -z "$pic_object" ||
-+ test -z "$non_pic_object" ||
-+ test "$pic_object" = none &&
-+ test "$non_pic_object" = none; then
-+ func_fatal_error "cannot find name of object for \`$arg'"
-+ fi
-+
-+ # Extract subdirectory from the argument.
-+ func_dirname "$arg" "/" ""
-+ xdir="$func_dirname_result"
-+
-+ if test "$pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ pic_object="$xdir$pic_object"
-+
-+ if test "$prev" = dlfiles; then
-+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+ dlfiles="$dlfiles $pic_object"
-+ prev=
-+ continue
-+ else
-+ # If libtool objects are unsupported, then we need to preload.
-+ prev=dlprefiles
-+ fi
-+ fi
-+
-+ # CHECK ME: I think I busted this. -Ossama
-+ if test "$prev" = dlprefiles; then
-+ # Preload the old-style object.
-+ dlprefiles="$dlprefiles $pic_object"
-+ prev=
-+ fi
-+
-+ # A PIC object.
-+ func_append libobjs " $pic_object"
-+ arg="$pic_object"
-+ fi
-+
-+ # Non-PIC object.
-+ if test "$non_pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ non_pic_object="$xdir$non_pic_object"
-+
-+ # A standard non-PIC object
-+ func_append non_pic_objects " $non_pic_object"
-+ if test -z "$pic_object" || test "$pic_object" = none ; then
-+ arg="$non_pic_object"
-+ fi
-+ else
-+ # If the PIC object exists, use it instead.
-+ # $xdir was prepended to $pic_object above.
-+ non_pic_object="$pic_object"
-+ func_append non_pic_objects " $non_pic_object"
-+ fi
-+ else
-+ # Only an error if not doing a dry-run.
-+ if $opt_dry_run; then
-+ # Extract subdirectory from the argument.
-+ func_dirname "$arg" "/" ""
-+ xdir="$func_dirname_result"
-+
-+ func_lo2o "$arg"
-+ pic_object=$xdir$objdir/$func_lo2o_result
-+ non_pic_object=$xdir$func_lo2o_result
-+ func_append libobjs " $pic_object"
-+ func_append non_pic_objects " $non_pic_object"
-+ else
-+ func_fatal_error "\`$arg' is not a valid libtool object"
-+ fi
-+ fi
-+ ;;
-+
-+ *.$libext)
-+ # An archive.
-+ deplibs="$deplibs $arg"
-+ old_deplibs="$old_deplibs $arg"
-+ continue
-+ ;;
-+
-+ *.la)
-+ # A libtool-controlled library.
-+
-+ if test "$prev" = dlfiles; then
-+ # This library was specified with -dlopen.
-+ dlfiles="$dlfiles $arg"
-+ prev=
-+ elif test "$prev" = dlprefiles; then
-+ # The library was specified with -dlpreopen.
-+ dlprefiles="$dlprefiles $arg"
-+ prev=
-+ else
-+ deplibs="$deplibs $arg"
-+ fi
-+ continue
-+ ;;
-+
-+ # Some other compiler argument.
-+ *)
-+ # Unknown arguments in both finalize_command and compile_command need
-+ # to be aesthetically quoted because they are evaled later.
-+ func_quote_for_eval "$arg"
-+ arg="$func_quote_for_eval_result"
-+ ;;
-+ esac # arg
-+
-+ # Now actually substitute the argument into the commands.
-+ if test -n "$arg"; then
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ fi
-+ done # argument parsing loop
-+
-+ test -n "$prev" && \
-+ func_fatal_help "the \`$prevarg' option requires an argument"
-+
-+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+ eval arg=\"$export_dynamic_flag_spec\"
-+ func_append compile_command " $arg"
-+ func_append finalize_command " $arg"
-+ fi
-+
-+ oldlibs=
-+ # calculate the name of the file, without its directory
-+ func_basename "$output"
-+ outputname="$func_basename_result"
-+ libobjs_save="$libobjs"
-+
-+ if test -n "$shlibpath_var"; then
-+ # get the directories listed in $shlibpath_var
-+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+ else
-+ shlib_search_path=
-+ fi
-+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+ func_dirname "$output" "/" ""
-+ output_objdir="$func_dirname_result$objdir"
-+ # Create the object directory.
-+ func_mkdir_p "$output_objdir"
-+
-+ # Determine the type of output
-+ case $output in
-+ "")
-+ func_fatal_help "you must specify an output file"
-+ ;;
-+ *.$libext) linkmode=oldlib ;;
-+ *.lo | *.$objext) linkmode=obj ;;
-+ *.la) linkmode=lib ;;
-+ *) linkmode=prog ;; # Anything else should be a program.
-+ esac
-+
-+ specialdeplibs=
-+
-+ libs=
-+ # Find all interdependent deplibs by searching for libraries
-+ # that are linked more than once (e.g. -la -lb -la)
-+ for deplib in $deplibs; do
-+ if $opt_duplicate_deps ; then
-+ case "$libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ libs="$libs $deplib"
-+ done
-+
-+ if test "$linkmode" = lib; then
-+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+ # Compute libraries that are listed more than once in $predeps
-+ # $postdeps and mark them as special (i.e., whose duplicates are
-+ # not to be eliminated).
-+ pre_post_deps=
-+ if $opt_duplicate_compiler_generated_deps; then
-+ for pre_post_dep in $predeps $postdeps; do
-+ case "$pre_post_deps " in
-+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+ esac
-+ pre_post_deps="$pre_post_deps $pre_post_dep"
-+ done
-+ fi
-+ pre_post_deps=
-+ fi
-+
-+ deplibs=
-+ newdependency_libs=
-+ newlib_search_path=
-+ need_relink=no # whether we're linking any uninstalled libtool libraries
-+ notinst_deplibs= # not-installed libtool libraries
-+ notinst_path= # paths that contain not-installed libtool libraries
-+
-+ case $linkmode in
-+ lib)
-+ passes="conv dlpreopen link"
-+ for file in $dlfiles $dlprefiles; do
-+ case $file in
-+ *.la) ;;
-+ *)
-+ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-+ ;;
-+ esac
-+ done
-+ ;;
-+ prog)
-+ compile_deplibs=
-+ finalize_deplibs=
-+ alldeplibs=no
-+ newdlfiles=
-+ newdlprefiles=
-+ passes="conv scan dlopen dlpreopen link"
-+ ;;
-+ *) passes="conv"
-+ ;;
-+ esac
-+
-+ for pass in $passes; do
-+ # The preopen pass in lib mode reverses $deplibs; put it back here
-+ # so that -L comes before libs that need it for instance...
-+ if test "$linkmode,$pass" = "lib,link"; then
-+ ## FIXME: Find the place where the list is rebuilt in the wrong
-+ ## order, and fix it there properly
-+ tmp_deplibs=
-+ for deplib in $deplibs; do
-+ tmp_deplibs="$deplib $tmp_deplibs"
-+ done
-+ deplibs="$tmp_deplibs"
-+ fi
-+
-+ if test "$linkmode,$pass" = "lib,link" ||
-+ test "$linkmode,$pass" = "prog,scan"; then
-+ libs="$deplibs"
-+ deplibs=
-+ fi
-+ if test "$linkmode" = prog; then
-+ case $pass in
-+ dlopen) libs="$dlfiles" ;;
-+ dlpreopen) libs="$dlprefiles" ;;
-+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ esac
-+ fi
-+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
-+ # Collect and forward deplibs of preopened libtool libs
-+ for lib in $dlprefiles; do
-+ # Ignore non-libtool-libs
-+ dependency_libs=
-+ case $lib in
-+ *.la) func_source "$lib" ;;
-+ esac
-+
-+ # Collect preopened libtool deplibs, except any this library
-+ # has declared as weak libs
-+ for deplib in $dependency_libs; do
-+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+ case " $weak_libs " in
-+ *" $deplib_base "*) ;;
-+ *) deplibs="$deplibs $deplib" ;;
-+ esac
-+ done
-+ done
-+ libs="$dlprefiles"
-+ fi
-+ if test "$pass" = dlopen; then
-+ # Collect dlpreopened libraries
-+ save_deplibs="$deplibs"
-+ deplibs=
-+ fi
-+
-+ for deplib in $libs; do
-+ lib=
-+ found=no
-+ case $deplib in
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ compiler_flags="$compiler_flags $deplib"
-+ if test "$linkmode" = lib ; then
-+ case "$new_inherited_linker_flags " in
-+ *" $deplib "*) ;;
-+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+ esac
-+ fi
-+ fi
-+ continue
-+ ;;
-+ -l*)
-+ if test "$linkmode" != lib && test "$linkmode" != prog; then
-+ func_warning "\`-l' is ignored for archives/objects"
-+ continue
-+ fi
-+ func_stripname '-l' '' "$deplib"
-+ name=$func_stripname_result
-+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ for search_ext in .la $std_shrext .so .a; do
-+ # Search the libtool library
-+ lib="$searchdir/lib${name}${search_ext}"
-+ if test -f "$lib"; then
-+ if test "$search_ext" = ".la"; then
-+ found=yes
-+ else
-+ found=no
-+ fi
-+ break 2
-+ fi
-+ done
-+ done
-+ if test "$found" != yes; then
-+ # deplib doesn't seem to be a libtool library
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ continue
-+ else # deplib is a libtool library
-+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-+ # We need to do some special things here, and not later.
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $deplib "*)
-+ if func_lalib_p "$lib"; then
-+ library_names=
-+ old_library=
-+ func_source "$lib"
-+ for l in $old_library $library_names; do
-+ ll="$l"
-+ done
-+ if test "X$ll" = "X$old_library" ; then # only static version available
-+ found=no
-+ func_dirname "$lib" "" "."
-+ ladir="$func_dirname_result"
-+ lib=$ladir/$old_library
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ continue
-+ fi
-+ fi
-+ ;;
-+ *) ;;
-+ esac
-+ fi
-+ fi
-+ ;; # -l
-+ *.ltframework)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ if test "$linkmode" = lib ; then
-+ case "$new_inherited_linker_flags " in
-+ *" $deplib "*) ;;
-+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+ esac
-+ fi
-+ fi
-+ continue
-+ ;;
-+ -L*)
-+ case $linkmode in
-+ lib)
-+ deplibs="$deplib $deplibs"
-+ test "$pass" = conv && continue
-+ newdependency_libs="$deplib $newdependency_libs"
-+ func_stripname '-L' '' "$deplib"
-+ newlib_search_path="$newlib_search_path $func_stripname_result"
-+ ;;
-+ prog)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ continue
-+ fi
-+ if test "$pass" = scan; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ fi
-+ func_stripname '-L' '' "$deplib"
-+ newlib_search_path="$newlib_search_path $func_stripname_result"
-+ ;;
-+ *)
-+ func_warning "\`-L' is ignored for archives/objects"
-+ ;;
-+ esac # linkmode
-+ continue
-+ ;; # -L
-+ -R*)
-+ if test "$pass" = link; then
-+ func_stripname '-R' '' "$deplib"
-+ dir=$func_stripname_result
-+ # Make sure the xrpath contains only unique directories.
-+ case "$xrpath " in
-+ *" $dir "*) ;;
-+ *) xrpath="$xrpath $dir" ;;
-+ esac
-+ fi
-+ deplibs="$deplib $deplibs"
-+ continue
-+ ;;
-+ *.la) lib="$deplib" ;;
-+ *.$libext)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ continue
-+ fi
-+ case $linkmode in
-+ lib)
-+ # Linking convenience modules into shared libraries is allowed,
-+ # but linking other static libraries is non-portable.
-+ case " $dlpreconveniencelibs " in
-+ *" $deplib "*) ;;
-+ *)
-+ valid_a_lib=no
-+ case $deplibs_check_method in
-+ match_pattern*)
-+ set dummy $deplibs_check_method; shift
-+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+ | $EGREP "$match_pattern_regex" > /dev/null; then
-+ valid_a_lib=yes
-+ fi
-+ ;;
-+ pass_all)
-+ valid_a_lib=yes
-+ ;;
-+ esac
-+ if test "$valid_a_lib" != yes; then
-+ $ECHO
-+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which you do not appear to have"
-+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
-+ $ECHO "*** that it is just a static archive that I should not use here."
-+ else
-+ $ECHO
-+ $ECHO "*** Warning: Linking the shared library $output against the"
-+ $ECHO "*** static library $deplib is not portable!"
-+ deplibs="$deplib $deplibs"
-+ fi
-+ ;;
-+ esac
-+ continue
-+ ;;
-+ prog)
-+ if test "$pass" != link; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ fi
-+ continue
-+ ;;
-+ esac # linkmode
-+ ;; # *.$libext
-+ *.lo | *.$objext)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ elif test "$linkmode" = prog; then
-+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+ # If there is no dlopen support or we're linking statically,
-+ # we need to preload.
-+ newdlprefiles="$newdlprefiles $deplib"
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ newdlfiles="$newdlfiles $deplib"
-+ fi
-+ fi
-+ continue
-+ ;;
-+ %DEPLIBS%)
-+ alldeplibs=yes
-+ continue
-+ ;;
-+ esac # case $deplib
-+
-+ if test "$found" = yes || test -f "$lib"; then :
-+ else
-+ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-+ fi
-+
-+ # Check to see that this really is a libtool archive.
-+ func_lalib_unsafe_p "$lib" \
-+ || func_fatal_error "\`$lib' is not a valid libtool archive"
-+
-+ func_dirname "$lib" "" "."
-+ ladir="$func_dirname_result"
-+
-+ dlname=
-+ dlopen=
-+ dlpreopen=
-+ libdir=
-+ library_names=
-+ old_library=
-+ inherited_linker_flags=
-+ # If the library was installed with an old release of libtool,
-+ # it will not redefine variables installed, or shouldnotlink
-+ installed=yes
-+ shouldnotlink=no
-+ avoidtemprpath=
-+
-+
-+ # Read the .la file
-+ func_source "$lib"
-+
-+ # Convert "-framework foo" to "foo.ltframework"
-+ if test -n "$inherited_linker_flags"; then
-+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-+ case " $new_inherited_linker_flags " in
-+ *" $tmp_inherited_linker_flag "*) ;;
-+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+ esac
-+ done
-+ fi
-+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-+ else
-+ compiler_flags="$compiler_flags $inherited_linker_flags"
-+ fi
-+ if test "$linkmode,$pass" = "lib,link" ||
-+ test "$linkmode,$pass" = "prog,scan" ||
-+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+ fi
-+
-+ if test "$pass" = conv; then
-+ # Only check for convenience libraries
-+ deplibs="$lib $deplibs"
-+ if test -z "$libdir"; then
-+ if test -z "$old_library"; then
-+ func_fatal_error "cannot find name of link library for \`$lib'"
-+ fi
-+ # It is a libtool convenience library, so add in its objects.
-+ convenience="$convenience $ladir/$objdir/$old_library"
-+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
-+ func_fatal_error "\`$lib' is not a convenience library"
-+ fi
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
-+ continue
-+ fi # $pass = conv
-+
-+
-+ # Get the name of the library we link against.
-+ linklib=
-+ for l in $old_library $library_names; do
-+ linklib="$l"
-+ done
-+ if test -z "$linklib"; then
-+ func_fatal_error "cannot find name of link library for \`$lib'"
-+ fi
-+
-+ # This library was specified with -dlopen.
-+ if test "$pass" = dlopen; then
-+ if test -z "$libdir"; then
-+ func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-+ fi
-+ if test -z "$dlname" ||
-+ test "$dlopen_support" != yes ||
-+ test "$build_libtool_libs" = no; then
-+ # If there is no dlname, no dlopen support or we're linking
-+ # statically, we need to preload. We also need to preload any
-+ # dependent libraries so libltdl's deplib preloader doesn't
-+ # bomb out in the load deplibs phase.
-+ dlprefiles="$dlprefiles $lib $dependency_libs"
-+ else
-+ newdlfiles="$newdlfiles $lib"
-+ fi
-+ continue
-+ fi # $pass = dlopen
-+
-+ # We need an absolute path.
-+ case $ladir in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+ *)
-+ abs_ladir=`cd "$ladir" && pwd`
-+ if test -z "$abs_ladir"; then
-+ func_warning "cannot determine absolute directory name of \`$ladir'"
-+ func_warning "passing it literally to the linker, although it might fail"
-+ abs_ladir="$ladir"
-+ fi
-+ ;;
-+ esac
-+ func_basename "$lib"
-+ laname="$func_basename_result"
-+
-+ # Find the relevant object directory and library name.
-+ if test "X$installed" = Xyes; then
-+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+ func_warning "library \`$lib' was moved."
-+ dir="$ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ else
-+ dir="$libdir"
-+ absdir="$libdir"
-+ fi
-+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-+ else
-+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+ dir="$ladir"
-+ absdir="$abs_ladir"
-+ # Remove this search path later
-+ notinst_path="$notinst_path $abs_ladir"
-+ else
-+ dir="$ladir/$objdir"
-+ absdir="$abs_ladir/$objdir"
-+ # Remove this search path later
-+ notinst_path="$notinst_path $abs_ladir"
-+ fi
-+ fi # $installed = yes
-+ func_stripname 'lib' '.la' "$laname"
-+ name=$func_stripname_result
-+
-+ # This library was specified with -dlpreopen.
-+ if test "$pass" = dlpreopen; then
-+ if test -z "$libdir" && test "$linkmode" = prog; then
-+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-+ fi
-+ # Prefer using a static library (so that no silly _DYNAMIC symbols
-+ # are required to link).
-+ if test -n "$old_library"; then
-+ newdlprefiles="$newdlprefiles $dir/$old_library"
-+ # Keep a list of preopened convenience libraries to check
-+ # that they are being used correctly in the link pass.
-+ test -z "$libdir" && \
-+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-+ # Otherwise, use the dlname, so that lt_dlopen finds it.
-+ elif test -n "$dlname"; then
-+ newdlprefiles="$newdlprefiles $dir/$dlname"
-+ else
-+ newdlprefiles="$newdlprefiles $dir/$linklib"
-+ fi
-+ fi # $pass = dlpreopen
-+
-+ if test -z "$libdir"; then
-+ # Link the convenience library
-+ if test "$linkmode" = lib; then
-+ deplibs="$dir/$old_library $deplibs"
-+ elif test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$dir/$old_library $compile_deplibs"
-+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+ else
-+ deplibs="$lib $deplibs" # used for prog,scan pass
-+ fi
-+ continue
-+ fi
-+
-+
-+ if test "$linkmode" = prog && test "$pass" != link; then
-+ newlib_search_path="$newlib_search_path $ladir"
-+ deplibs="$lib $deplibs"
-+
-+ linkalldeplibs=no
-+ if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+ test "$build_libtool_libs" = no; then
-+ linkalldeplibs=yes
-+ fi
-+
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ -L*) func_stripname '-L' '' "$deplib"
-+ newlib_search_path="$newlib_search_path $func_stripname_result"
-+ ;;
-+ esac
-+ # Need to link against all dependency_libs?
-+ if test "$linkalldeplibs" = yes; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ # Need to hardcode shared library paths
-+ # or/and link against static libraries
-+ newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done # for deplib
-+ continue
-+ fi # $linkmode = prog...
-+
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ if test -n "$library_names" &&
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
-+ # We need to hardcode the library path
-+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-+ # Make sure the rpath contains only unique directories.
-+ case "$temp_rpath:" in
-+ *"$absdir:"*) ;;
-+ *) temp_rpath="$temp_rpath$absdir:" ;;
-+ esac
-+ fi
-+
-+ # Hardcode the library path.
-+ # Skip directories that are in the system default run-time
-+ # search path.
-+ case " $sys_lib_dlsearch_path " in
-+ *" $absdir "*) ;;
-+ *)
-+ case "$compile_rpath " in
-+ *" $absdir "*) ;;
-+ *) compile_rpath="$compile_rpath $absdir"
-+ esac
-+ ;;
-+ esac
-+ case " $sys_lib_dlsearch_path " in
-+ *" $libdir "*) ;;
-+ *)
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir"
-+ esac
-+ ;;
-+ esac
-+ fi # $linkmode,$pass = prog,link...
-+
-+ if test "$alldeplibs" = yes &&
-+ { test "$deplibs_check_method" = pass_all ||
-+ { test "$build_libtool_libs" = yes &&
-+ test -n "$library_names"; }; }; then
-+ # We only need to search for static libraries
-+ continue
-+ fi
-+ fi
-+
-+ link_static=no # Whether the deplib will be linked statically
-+ use_static_libs=$prefer_static_libs
-+ if test "$use_static_libs" = built && test "$installed" = yes; then
-+ use_static_libs=no
-+ fi
-+ if test -n "$library_names" &&
-+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
-+ case $host in
-+ *cygwin* | *mingw*)
-+ # No point in relinking DLLs because paths are not encoded
-+ notinst_deplibs="$notinst_deplibs $lib"
-+ need_relink=no
-+ ;;
-+ *)
-+ if test "$installed" = no; then
-+ notinst_deplibs="$notinst_deplibs $lib"
-+ need_relink=yes
-+ fi
-+ ;;
-+ esac
-+ # This is a shared library
-+
-+ # Warn about portability, can't link against -module's on some
-+ # systems (darwin). Don't bleat about dlopened modules though!
-+ dlopenmodule=""
-+ for dlpremoduletest in $dlprefiles; do
-+ if test "X$dlpremoduletest" = "X$lib"; then
-+ dlopenmodule="$dlpremoduletest"
-+ break
-+ fi
-+ done
-+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-+ $ECHO
-+ if test "$linkmode" = prog; then
-+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
-+ else
-+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-+ fi
-+ $ECHO "*** $linklib is not portable!"
-+ fi
-+ if test "$linkmode" = lib &&
-+ test "$hardcode_into_libs" = yes; then
-+ # Hardcode the library path.
-+ # Skip directories that are in the system default run-time
-+ # search path.
-+ case " $sys_lib_dlsearch_path " in
-+ *" $absdir "*) ;;
-+ *)
-+ case "$compile_rpath " in
-+ *" $absdir "*) ;;
-+ *) compile_rpath="$compile_rpath $absdir"
-+ esac
-+ ;;
-+ esac
-+ case " $sys_lib_dlsearch_path " in
-+ *" $libdir "*) ;;
-+ *)
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir"
-+ esac
-+ ;;
-+ esac
-+ fi
-+
-+ if test -n "$old_archive_from_expsyms_cmds"; then
-+ # figure out the soname
-+ set dummy $library_names
-+ shift
-+ realname="$1"
-+ shift
-+ libname=`eval "\\$ECHO \"$libname_spec\""`
-+ # use dlname if we got it. it's perfectly good, no?
-+ if test -n "$dlname"; then
-+ soname="$dlname"
-+ elif test -n "$soname_spec"; then
-+ # bleh windows
-+ case $host in
-+ *cygwin* | mingw*)
-+ major=`expr $current - $age`
-+ versuffix="-$major"
-+ ;;
-+ esac
-+ eval soname=\"$soname_spec\"
-+ else
-+ soname="$realname"
-+ fi
-+
-+ # Make a new name for the extract_expsyms_cmds to use
-+ soroot="$soname"
-+ func_basename "$soroot"
-+ soname="$func_basename_result"
-+ func_stripname 'lib' '.dll' "$soname"
-+ newlib=libimp-$func_stripname_result.a
-+
-+ # If the library has no export list, then create one now
-+ if test -f "$output_objdir/$soname-def"; then :
-+ else
-+ func_echo "extracting exported symbol list from \`$soname'"
-+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-+ fi
-+
-+ # Create $newlib
-+ if test -f "$output_objdir/$newlib"; then :; else
-+ func_echo "generating import library for \`$soname'"
-+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-+ fi
-+ # make sure the library variables are pointing to the new library
-+ dir=$output_objdir
-+ linklib=$newlib
-+ fi # test -n "$old_archive_from_expsyms_cmds"
-+
-+ if test "$linkmode" = prog || test "$mode" != relink; then
-+ add_shlibpath=
-+ add_dir=
-+ add=
-+ lib_linked=yes
-+ case $hardcode_action in
-+ immediate | unsupported)
-+ if test "$hardcode_direct" = no; then
-+ add="$dir/$linklib"
-+ case $host in
-+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+ *-*-unixware7*) add_dir="-L$dir" ;;
-+ *-*-darwin* )
-+ # if the lib is a (non-dlopened) module then we can not
-+ # link against it, someone is ignoring the earlier warnings
-+ if /usr/bin/file -L $add 2> /dev/null |
-+ $GREP ": [^:]* bundle" >/dev/null ; then
-+ if test "X$dlopenmodule" != "X$lib"; then
-+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
-+ if test -z "$old_library" ; then
-+ $ECHO
-+ $ECHO "*** And there doesn't seem to be a static archive available"
-+ $ECHO "*** The link will probably fail, sorry"
-+ else
-+ add="$dir/$old_library"
-+ fi
-+ elif test -n "$old_library"; then
-+ add="$dir/$old_library"
-+ fi
-+ fi
-+ esac
-+ elif test "$hardcode_minus_L" = no; then
-+ case $host in
-+ *-*-sunos*) add_shlibpath="$dir" ;;
-+ esac
-+ add_dir="-L$dir"
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = no; then
-+ add_shlibpath="$dir"
-+ add="-l$name"
-+ else
-+ lib_linked=no
-+ fi
-+ ;;
-+ relink)
-+ if test "$hardcode_direct" = yes &&
-+ test "$hardcode_direct_absolute" = no; then
-+ add="$dir/$linklib"
-+ elif test "$hardcode_minus_L" = yes; then
-+ add_dir="-L$dir"
-+ # Try looking first in the location we're being installed to.
-+ if test -n "$inst_prefix_dir"; then
-+ case $libdir in
-+ [\\/]*)
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+ ;;
-+ esac
-+ fi
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = yes; then
-+ add_shlibpath="$dir"
-+ add="-l$name"
-+ else
-+ lib_linked=no
-+ fi
-+ ;;
-+ *) lib_linked=no ;;
-+ esac
-+
-+ if test "$lib_linked" != yes; then
-+ func_fatal_configuration "unsupported hardcode properties"
-+ fi
-+
-+ if test -n "$add_shlibpath"; then
-+ case :$compile_shlibpath: in
-+ *":$add_shlibpath:"*) ;;
-+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+ esac
-+ fi
-+ if test "$linkmode" = prog; then
-+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+ else
-+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+ test -n "$add" && deplibs="$add $deplibs"
-+ if test "$hardcode_direct" != yes &&
-+ test "$hardcode_minus_L" != yes &&
-+ test "$hardcode_shlibpath_var" = yes; then
-+ case :$finalize_shlibpath: in
-+ *":$libdir:"*) ;;
-+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+ esac
-+ fi
-+ fi
-+ fi
-+
-+ if test "$linkmode" = prog || test "$mode" = relink; then
-+ add_shlibpath=
-+ add_dir=
-+ add=
-+ # Finalize command for both is simple: just hardcode it.
-+ if test "$hardcode_direct" = yes &&
-+ test "$hardcode_direct_absolute" = no; then
-+ add="$libdir/$linklib"
-+ elif test "$hardcode_minus_L" = yes; then
-+ add_dir="-L$libdir"
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = yes; then
-+ case :$finalize_shlibpath: in
-+ *":$libdir:"*) ;;
-+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+ esac
-+ add="-l$name"
-+ elif test "$hardcode_automatic" = yes; then
-+ if test -n "$inst_prefix_dir" &&
-+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+ add="$inst_prefix_dir$libdir/$linklib"
-+ else
-+ add="$libdir/$linklib"
-+ fi
-+ else
-+ # We cannot seem to hardcode it, guess we'll fake it.
-+ add_dir="-L$libdir"
-+ # Try looking first in the location we're being installed to.
-+ if test -n "$inst_prefix_dir"; then
-+ case $libdir in
-+ [\\/]*)
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+ ;;
-+ esac
-+ fi
-+ add="-l$name"
-+ fi
-+
-+ if test "$linkmode" = prog; then
-+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+ else
-+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+ test -n "$add" && deplibs="$add $deplibs"
-+ fi
-+ fi
-+ elif test "$linkmode" = prog; then
-+ # Here we assume that one of hardcode_direct or hardcode_minus_L
-+ # is not unsupported. This is valid on all known static and
-+ # shared platforms.
-+ if test "$hardcode_direct" != unsupported; then
-+ test -n "$old_library" && linklib="$old_library"
-+ compile_deplibs="$dir/$linklib $compile_deplibs"
-+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+ else
-+ compile_deplibs="-l$name -L$dir $compile_deplibs"
-+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+ fi
-+ elif test "$build_libtool_libs" = yes; then
-+ # Not a shared library
-+ if test "$deplibs_check_method" != pass_all; then
-+ # We're trying link a shared library against a static one
-+ # but the system doesn't support it.
-+
-+ # Just print a warning and add the library to dependency_libs so
-+ # that the program can be linked against the static library.
-+ $ECHO
-+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which you do not appear to have."
-+ if test "$module" = yes; then
-+ $ECHO "*** But as you try to build a module library, libtool will still create "
-+ $ECHO "*** a static module, that should work as long as the dlopening application"
-+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+ if test -z "$global_symbol_pipe"; then
-+ $ECHO
-+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+ $ECHO "*** not find such a program. So, this module is probably useless."
-+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+ fi
-+ if test "$build_old_libs" = no; then
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ fi
-+ else
-+ deplibs="$dir/$old_library $deplibs"
-+ link_static=yes
-+ fi
-+ fi # link shared/static library?
-+
-+ if test "$linkmode" = lib; then
-+ if test -n "$dependency_libs" &&
-+ { test "$hardcode_into_libs" != yes ||
-+ test "$build_old_libs" = yes ||
-+ test "$link_static" = yes; }; then
-+ # Extract -R from dependency_libs
-+ temp_deplibs=
-+ for libdir in $dependency_libs; do
-+ case $libdir in
-+ -R*) func_stripname '-R' '' "$libdir"
-+ temp_xrpath=$func_stripname_result
-+ case " $xrpath " in
-+ *" $temp_xrpath "*) ;;
-+ *) xrpath="$xrpath $temp_xrpath";;
-+ esac;;
-+ *) temp_deplibs="$temp_deplibs $libdir";;
-+ esac
-+ done
-+ dependency_libs="$temp_deplibs"
-+ fi
-+
-+ newlib_search_path="$newlib_search_path $absdir"
-+ # Link against this library
-+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+ # ... and its dependency_libs
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ newdependency_libs="$deplib $newdependency_libs"
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
-+
-+ if test "$link_all_deplibs" != no; then
-+ # Add the search paths of all dependency libraries
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ -L*) path="$deplib" ;;
-+ *.la)
-+ func_dirname "$deplib" "" "."
-+ dir="$func_dirname_result"
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+ *)
-+ absdir=`cd "$dir" && pwd`
-+ if test -z "$absdir"; then
-+ func_warning "cannot determine absolute directory name of \`$dir'"
-+ absdir="$dir"
-+ fi
-+ ;;
-+ esac
-+ if $GREP "^installed=no" $deplib > /dev/null; then
-+ case $host in
-+ *-*-darwin*)
-+ depdepl=
-+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ if test -n "$deplibrary_names" ; then
-+ for tmp in $deplibrary_names ; do
-+ depdepl=$tmp
-+ done
-+ if test -f "$absdir/$objdir/$depdepl" ; then
-+ depdepl="$absdir/$objdir/$depdepl"
-+ darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
-+ darwin_install_name=`$ECHO $darwin_install_name`
-+ if test -z "$darwin_install_name"; then
-+ darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
-+ darwin_install_name=`$ECHO $darwin_install_name`
-+ fi
-+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+ path=
-+ fi
-+ fi
-+ ;;
-+ *)
-+ path="-L$absdir/$objdir"
-+ ;;
-+ esac
-+ else
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ test -z "$libdir" && \
-+ func_fatal_error "\`$deplib' is not a valid libtool archive"
-+ test "$absdir" != "$libdir" && \
-+ func_warning "\`$deplib' seems to be moved"
-+
-+ path="-L$absdir"
-+ fi
-+ ;;
-+ esac
-+ case " $deplibs " in
-+ *" $path "*) ;;
-+ *) deplibs="$path $deplibs" ;;
-+ esac
-+ done
-+ fi # link_all_deplibs != no
-+ fi # linkmode = lib
-+ done # for deplib in $libs
-+ dependency_libs="$newdependency_libs"
-+ if test "$pass" = dlpreopen; then
-+ # Link the dlpreopened libraries before other libraries
-+ for deplib in $save_deplibs; do
-+ deplibs="$deplib $deplibs"
-+ done
-+ fi
-+ if test "$pass" != dlopen; then
-+ if test "$pass" != conv; then
-+ # Make sure lib_search_path contains only unique directories.
-+ lib_search_path=
-+ for dir in $newlib_search_path; do
-+ case "$lib_search_path " in
-+ *" $dir "*) ;;
-+ *) lib_search_path="$lib_search_path $dir" ;;
-+ esac
-+ done
-+ newlib_search_path=
-+ fi
-+
-+ if test "$linkmode,$pass" != "prog,link"; then
-+ vars="deplibs"
-+ else
-+ vars="compile_deplibs finalize_deplibs"
-+ fi
-+ for var in $vars dependency_libs; do
-+ # Add libraries to $var in reverse order
-+ eval tmp_libs=\"\$$var\"
-+ new_libs=
-+ for deplib in $tmp_libs; do
-+ # FIXME: Pedantically, this is the right thing to do, so
-+ # that some nasty dependency loop isn't accidentally
-+ # broken:
-+ #new_libs="$deplib $new_libs"
-+ # Pragmatically, this seems to cause very few problems in
-+ # practice:
-+ case $deplib in
-+ -L*) new_libs="$deplib $new_libs" ;;
-+ -R*) ;;
-+ *)
-+ # And here is the reason: when a library appears more
-+ # than once as an explicit dependence of a library, or
-+ # is implicitly linked in more than once by the
-+ # compiler, it is considered special, and multiple
-+ # occurrences thereof are not removed. Compare this
-+ # with having the same library being listed as a
-+ # dependency of multiple other libraries: in this case,
-+ # we know (pedantically, we assume) the library does not
-+ # need to be listed more than once, so we keep only the
-+ # last copy. This is not always right, but it is rare
-+ # enough that we require users that really mean to play
-+ # such unportable linking tricks to link the library
-+ # using -Wl,-lname, so that libtool does not consider it
-+ # for duplicate removal.
-+ case " $specialdeplibs " in
-+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+ *)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$deplib $new_libs" ;;
-+ esac
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ tmp_libs=
-+ for deplib in $new_libs; do
-+ case $deplib in
-+ -L*)
-+ case " $tmp_libs " in
-+ *" $deplib "*) ;;
-+ *) tmp_libs="$tmp_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) tmp_libs="$tmp_libs $deplib" ;;
-+ esac
-+ done
-+ eval $var=\"$tmp_libs\"
-+ done # for var
-+ fi
-+ # Last step: remove runtime libs from dependency_libs
-+ # (they stay in deplibs)
-+ tmp_libs=
-+ for i in $dependency_libs ; do
-+ case " $predeps $postdeps $compiler_lib_search_path " in
-+ *" $i "*)
-+ i=""
-+ ;;
-+ esac
-+ if test -n "$i" ; then
-+ tmp_libs="$tmp_libs $i"
-+ fi
-+ done
-+ dependency_libs=$tmp_libs
-+ done # for pass
-+ if test "$linkmode" = prog; then
-+ dlfiles="$newdlfiles"
-+ fi
-+ if test "$linkmode" = prog || test "$linkmode" = lib; then
-+ dlprefiles="$newdlprefiles"
-+ fi
-+
-+ case $linkmode in
-+ oldlib)
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ func_warning "\`-dlopen' is ignored for archives"
-+ fi
-+
-+ test -n "$deplibs" && \
-+ func_warning "\`-l' and \`-L' are ignored for archives"
-+
-+
-+ test -n "$rpath" && \
-+ func_warning "\`-rpath' is ignored for archives"
-+
-+ test -n "$xrpath" && \
-+ func_warning "\`-R' is ignored for archives"
-+
-+ test -n "$vinfo" && \
-+ func_warning "\`-version-info/-version-number' is ignored for archives"
-+
-+ test -n "$release" && \
-+ func_warning "\`-release' is ignored for archives"
-+
-+ test -n "$export_symbols$export_symbols_regex" && \
-+ func_warning "\`-export-symbols' is ignored for archives"
-+
-+ # Now set the variables for building old libraries.
-+ build_libtool_libs=no
-+ oldlibs="$output"
-+ objs="$objs$old_deplibs"
-+ ;;
-+
-+ lib)
-+ # Make sure we only generate libraries of the form `libNAME.la'.
-+ case $outputname in
-+ lib*)
-+ func_stripname 'lib' '.la' "$outputname"
-+ name=$func_stripname_result
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval libname=\"$libname_spec\"
-+ ;;
-+ *)
-+ test "$module" = no && \
-+ func_fatal_help "libtool library \`$output' must begin with \`lib'"
-+
-+ if test "$need_lib_prefix" != no; then
-+ # Add the "lib" prefix for modules if required
-+ func_stripname '' '.la' "$outputname"
-+ name=$func_stripname_result
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval libname=\"$libname_spec\"
-+ else
-+ func_stripname '' '.la' "$outputname"
-+ libname=$func_stripname_result
-+ fi
-+ ;;
-+ esac
-+
-+ if test -n "$objs"; then
-+ if test "$deplibs_check_method" != pass_all; then
-+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-+ else
-+ $ECHO
-+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-+ $ECHO "*** objects $objs is not portable!"
-+ libobjs="$libobjs $objs"
-+ fi
-+ fi
-+
-+ test "$dlself" != no && \
-+ func_warning "\`-dlopen self' is ignored for libtool libraries"
-+
-+ set dummy $rpath
-+ shift
-+ test "$#" -gt 1 && \
-+ func_warning "ignoring multiple \`-rpath's for a libtool library"
-+
-+ install_libdir="$1"
-+
-+ oldlibs=
-+ if test -z "$rpath"; then
-+ if test "$build_libtool_libs" = yes; then
-+ # Building a libtool convenience library.
-+ # Some compilers have problems with a `.al' extension so
-+ # convenience libraries should have the same extension an
-+ # archive normally would.
-+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+ build_libtool_libs=convenience
-+ build_old_libs=yes
-+ fi
-+
-+ test -n "$vinfo" && \
-+ func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-+
-+ test -n "$release" && \
-+ func_warning "\`-release' is ignored for convenience libraries"
-+ else
-+
-+ # Parse the version information argument.
-+ save_ifs="$IFS"; IFS=':'
-+ set dummy $vinfo 0 0 0
-+ shift
-+ IFS="$save_ifs"
-+
-+ test -n "$7" && \
-+ func_fatal_help "too many parameters to \`-version-info'"
-+
-+ # convert absolute version numbers to libtool ages
-+ # this retains compatibility with .la files and attempts
-+ # to make the code below a bit more comprehensible
-+
-+ case $vinfo_number in
-+ yes)
-+ number_major="$1"
-+ number_minor="$2"
-+ number_revision="$3"
-+ #
-+ # There are really only two kinds -- those that
-+ # use the current revision as the major version
-+ # and those that subtract age and use age as
-+ # a minor version. But, then there is irix
-+ # which has an extra 1 added just for fun
-+ #
-+ case $version_type in
-+ darwin|linux|osf|windows|none)
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
-+ ;;
-+ freebsd-aout|freebsd-elf|sunos)
-+ current="$number_major"
-+ revision="$number_minor"
-+ age="0"
-+ ;;
-+ irix|nonstopux)
-+ current=`expr $number_major + $number_minor - 1`
-+ age="$number_minor"
-+ revision="$number_minor"
-+ ;;
-+ esac
-+ ;;
-+ no)
-+ current="$1"
-+ revision="$2"
-+ age="$3"
-+ ;;
-+ esac
-+
-+ # Check that each of the things are valid numbers.
-+ case $current in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ func_error "CURRENT \`$current' must be a nonnegative integer"
-+ func_fatal_error "\`$vinfo' is not valid version information"
-+ ;;
-+ esac
-+
-+ case $revision in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ func_error "REVISION \`$revision' must be a nonnegative integer"
-+ func_fatal_error "\`$vinfo' is not valid version information"
-+ ;;
-+ esac
-+
-+ case $age in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ func_error "AGE \`$age' must be a nonnegative integer"
-+ func_fatal_error "\`$vinfo' is not valid version information"
-+ ;;
-+ esac
-+
-+ if test "$age" -gt "$current"; then
-+ func_error "AGE \`$age' is greater than the current interface number \`$current'"
-+ func_fatal_error "\`$vinfo' is not valid version information"
-+ fi
-+
-+ # Calculate the version variables.
-+ major=
-+ versuffix=
-+ verstring=
-+ case $version_type in
-+ none) ;;
-+
-+ darwin)
-+ # Like Linux, but with the current version available in
-+ # verstring for coding it into the library header
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ # Darwin ld doesn't like 0 for these options...
-+ minor_current=`expr $current + 1`
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+ ;;
-+
-+ freebsd-aout)
-+ major=".$current"
-+ versuffix=".$current.$revision";
-+ ;;
-+
-+ freebsd-elf)
-+ major=".$current"
-+ versuffix=".$current"
-+ ;;
-+
-+ irix | nonstopux)
-+ major=`expr $current - $age + 1`
-+
-+ case $version_type in
-+ nonstopux) verstring_prefix=nonstopux ;;
-+ *) verstring_prefix=sgi ;;
-+ esac
-+ verstring="$verstring_prefix$major.$revision"
-+
-+ # Add in all the interfaces that we are compatible with.
-+ loop=$revision
-+ while test "$loop" -ne 0; do
-+ iface=`expr $revision - $loop`
-+ loop=`expr $loop - 1`
-+ verstring="$verstring_prefix$major.$iface:$verstring"
-+ done
-+
-+ # Before this point, $major must not contain `.'.
-+ major=.$major
-+ versuffix="$major.$revision"
-+ ;;
-+
-+ linux)
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ ;;
-+
-+ osf)
-+ major=.`expr $current - $age`
-+ versuffix=".$current.$age.$revision"
-+ verstring="$current.$age.$revision"
-+
-+ # Add in all the interfaces that we are compatible with.
-+ loop=$age
-+ while test "$loop" -ne 0; do
-+ iface=`expr $current - $loop`
-+ loop=`expr $loop - 1`
-+ verstring="$verstring:${iface}.0"
-+ done
-+
-+ # Make executables depend on our current version.
-+ verstring="$verstring:${current}.0"
-+ ;;
-+
-+ qnx)
-+ major=".$current"
-+ versuffix=".$current"
-+ ;;
-+
-+ sunos)
-+ major=".$current"
-+ versuffix=".$current.$revision"
-+ ;;
-+
-+ windows)
-+ # Use '-' rather than '.', since we only want one
-+ # extension on DOS 8.3 filesystems.
-+ major=`expr $current - $age`
-+ versuffix="-$major"
-+ ;;
-+
-+ *)
-+ func_fatal_configuration "unknown library version type \`$version_type'"
-+ ;;
-+ esac
-+
-+ # Clear the version info if we defaulted, and they specified a release.
-+ if test -z "$vinfo" && test -n "$release"; then
-+ major=
-+ case $version_type in
-+ darwin)
-+ # we can't check for "0.0" in archive_cmds due to quoting
-+ # problems, so we reset it completely
-+ verstring=
-+ ;;
-+ *)
-+ verstring="0.0"
-+ ;;
-+ esac
-+ if test "$need_version" = no; then
-+ versuffix=
-+ else
-+ versuffix=".0.0"
-+ fi
-+ fi
-+
-+ # Remove version info from name if versioning should be avoided
-+ if test "$avoid_version" = yes && test "$need_version" = no; then
-+ major=
-+ versuffix=
-+ verstring=""
-+ fi
-+
-+ # Check to see if the archive will have undefined symbols.
-+ if test "$allow_undefined" = yes; then
-+ if test "$allow_undefined_flag" = unsupported; then
-+ func_warning "undefined symbols not allowed in $host shared libraries"
-+ build_libtool_libs=no
-+ build_old_libs=yes
-+ fi
-+ else
-+ # Don't allow undefined symbols.
-+ allow_undefined_flag="$no_undefined_flag"
-+ fi
-+
-+ fi
-+
-+ func_generate_dlsyms "$libname" "$libname" "yes"
-+ libobjs="$libobjs $symfileobj"
-+ test "X$libobjs" = "X " && libobjs=
-+
-+ if test "$mode" != relink; then
-+ # Remove our outputs, but don't remove object files since they
-+ # may have been created when compiling PIC objects.
-+ removelist=
-+ tempremovelist=`$ECHO "$output_objdir/*"`
-+ for p in $tempremovelist; do
-+ case $p in
-+ *.$objext)
-+ ;;
-+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+ if test "X$precious_files_regex" != "X"; then
-+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+ then
-+ continue
-+ fi
-+ fi
-+ removelist="$removelist $p"
-+ ;;
-+ *) ;;
-+ esac
-+ done
-+ test -n "$removelist" && \
-+ func_show_eval "${RM}r \$removelist"
-+ fi
-+
-+ # Now set the variables for building old libraries.
-+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+
-+ # Transform .lo files to .o files.
-+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+ fi
-+
-+ # Eliminate all temporary directories.
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-+ #done
-+
-+ if test -n "$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ temp_xrpath=
-+ for libdir in $xrpath; do
-+ temp_xrpath="$temp_xrpath -R$libdir"
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-+ dependency_libs="$temp_xrpath $dependency_libs"
-+ fi
-+ fi
-+
-+ # Make sure dlfiles contains only unique files that won't be dlpreopened
-+ old_dlfiles="$dlfiles"
-+ dlfiles=
-+ for lib in $old_dlfiles; do
-+ case " $dlprefiles $dlfiles " in
-+ *" $lib "*) ;;
-+ *) dlfiles="$dlfiles $lib" ;;
-+ esac
-+ done
-+
-+ # Make sure dlprefiles contains only unique files
-+ old_dlprefiles="$dlprefiles"
-+ dlprefiles=
-+ for lib in $old_dlprefiles; do
-+ case "$dlprefiles " in
-+ *" $lib "*) ;;
-+ *) dlprefiles="$dlprefiles $lib" ;;
-+ esac
-+ done
-+
-+ if test "$build_libtool_libs" = yes; then
-+ if test -n "$rpath"; then
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+ # these systems don't actually have a c library (as such)!
-+ ;;
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # Rhapsody C library is in the System framework
-+ deplibs="$deplibs System.ltframework"
-+ ;;
-+ *-*-netbsd*)
-+ # Don't link with libc until the a.out ld.so is fixed.
-+ ;;
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc due to us having libc/libc_r.
-+ ;;
-+ *-*-sco3.2v5* | *-*-sco5v6*)
-+ # Causes problems with __ctype
-+ ;;
-+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+ # Compiler inserts libc in the correct place for threads to work
-+ ;;
-+ *)
-+ # Add libc to deplibs on all other systems if necessary.
-+ if test "$build_libtool_need_lc" = "yes"; then
-+ deplibs="$deplibs -lc"
-+ fi
-+ ;;
-+ esac
-+ fi
-+
-+ # Transform deplibs into only deplibs that can be linked in shared.
-+ name_save=$name
-+ libname_save=$libname
-+ release_save=$release
-+ versuffix_save=$versuffix
-+ major_save=$major
-+ # I'm not sure if I'm treating the release correctly. I think
-+ # release should show up in the -l (ie -lgmp5) so we don't want to
-+ # add it in twice. Is that correct?
-+ release=""
-+ versuffix=""
-+ major=""
-+ newdeplibs=
-+ droppeddeps=no
-+ case $deplibs_check_method in
-+ pass_all)
-+ # Don't check for shared/static. Everything works.
-+ # This might be a little naive. We might want to check
-+ # whether the library exists or not. But this is on
-+ # osf3 & osf4 and I'm not really sure... Just
-+ # implementing what was already the behavior.
-+ newdeplibs=$deplibs
-+ ;;
-+ test_compile)
-+ # This code stresses the "libraries are programs" paradigm to its
-+ # limits. Maybe even breaks it. We compile a program, linking it
-+ # against the deplibs as a proxy for the library. Then we can check
-+ # whether they linked in statically or dynamically with ldd.
-+ $opt_dry_run || $RM conftest.c
-+ cat > conftest.c <<EOF
-+ int main() { return 0; }
-+EOF
-+ $opt_dry_run || $RM conftest
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-+ ldd_output=`ldd conftest`
-+ for i in $deplibs; do
-+ name=`expr $i : '-l\(.*\)'`
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" != "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $i "*)
-+ newdeplibs="$newdeplibs $i"
-+ i=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$i" ; then
-+ libname=`eval "\\$ECHO \"$libname_spec\""`
-+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+ set dummy $deplib_matches; shift
-+ deplib_match=$1
-+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+ newdeplibs="$newdeplibs $i"
-+ else
-+ droppeddeps=yes
-+ $ECHO
-+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which I believe you do not have"
-+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-+ fi
-+ fi
-+ else
-+ newdeplibs="$newdeplibs $i"
-+ fi
-+ done
-+ else
-+ # Error occurred in the first compile. Let's try to salvage
-+ # the situation: Compile a separate program for each library.
-+ for i in $deplibs; do
-+ name=`expr $i : '-l\(.*\)'`
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" != "0"; then
-+ $opt_dry_run || $RM conftest
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-+ ldd_output=`ldd conftest`
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $i "*)
-+ newdeplibs="$newdeplibs $i"
-+ i=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$i" ; then
-+ libname=`eval "\\$ECHO \"$libname_spec\""`
-+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+ set dummy $deplib_matches; shift
-+ deplib_match=$1
-+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+ newdeplibs="$newdeplibs $i"
-+ else
-+ droppeddeps=yes
-+ $ECHO
-+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which you do not appear to have"
-+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-+ fi
-+ fi
-+ else
-+ droppeddeps=yes
-+ $ECHO
-+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
-+ $ECHO "*** make it link in! You will probably need to install it or some"
-+ $ECHO "*** library that it depends on before this library will be fully"
-+ $ECHO "*** functional. Installing it before continuing would be even better."
-+ fi
-+ else
-+ newdeplibs="$newdeplibs $i"
-+ fi
-+ done
-+ fi
-+ ;;
-+ file_magic*)
-+ set dummy $deplibs_check_method; shift
-+ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+ for a_deplib in $deplibs; do
-+ name=`expr $a_deplib : '-l\(.*\)'`
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" != "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $a_deplib "*)
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$a_deplib" ; then
-+ libname=`eval "\\$ECHO \"$libname_spec\""`
-+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+ for potent_lib in $potential_libs; do
-+ # Follow soft links.
-+ if ls -lLd "$potent_lib" 2>/dev/null |
-+ $GREP " -> " >/dev/null; then
-+ continue
-+ fi
-+ # The statement above tries to avoid entering an
-+ # endless loop below, in case of cyclic links.
-+ # We might still enter an endless loop, since a link
-+ # loop can be closed while we follow links,
-+ # but so what?
-+ potlib="$potent_lib"
-+ while test -h "$potlib" 2>/dev/null; do
-+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+ case $potliblink in
-+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+ esac
-+ done
-+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-+ $SED -e 10q |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ break 2
-+ fi
-+ done
-+ done
-+ fi
-+ if test -n "$a_deplib" ; then
-+ droppeddeps=yes
-+ $ECHO
-+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which you do not appear to have"
-+ $ECHO "*** because I did check the linker path looking for a file starting"
-+ if test -z "$potlib" ; then
-+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-+ else
-+ $ECHO "*** with $libname and none of the candidates passed a file format test"
-+ $ECHO "*** using a file magic. Last file checked: $potlib"
-+ fi
-+ fi
-+ else
-+ # Add a -L argument.
-+ newdeplibs="$newdeplibs $a_deplib"
-+ fi
-+ done # Gone through all deplibs.
-+ ;;
-+ match_pattern*)
-+ set dummy $deplibs_check_method; shift
-+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+ for a_deplib in $deplibs; do
-+ name=`expr $a_deplib : '-l\(.*\)'`
-+ # If $name is empty we are operating on a -L argument.
-+ if test -n "$name" && test "$name" != "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $a_deplib "*)
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$a_deplib" ; then
-+ libname=`eval "\\$ECHO \"$libname_spec\""`
-+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+ for potent_lib in $potential_libs; do
-+ potlib="$potent_lib" # see symlink-check above in file_magic test
-+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-+ $EGREP "$match_pattern_regex" > /dev/null; then
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ break 2
-+ fi
-+ done
-+ done
-+ fi
-+ if test -n "$a_deplib" ; then
-+ droppeddeps=yes
-+ $ECHO
-+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+ $ECHO "*** I have the capability to make that library automatically link in when"
-+ $ECHO "*** you link to this library. But I can only do this if you have a"
-+ $ECHO "*** shared version of the library, which you do not appear to have"
-+ $ECHO "*** because I did check the linker path looking for a file starting"
-+ if test -z "$potlib" ; then
-+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-+ else
-+ $ECHO "*** with $libname and none of the candidates passed a file format test"
-+ $ECHO "*** using a regex pattern. Last file checked: $potlib"
-+ fi
-+ fi
-+ else
-+ # Add a -L argument.
-+ newdeplibs="$newdeplibs $a_deplib"
-+ fi
-+ done # Gone through all deplibs.
-+ ;;
-+ none | unknown | *)
-+ newdeplibs=""
-+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ for i in $predeps $postdeps ; do
-+ # can't use Xsed below, because $i might contain '/'
-+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-+ done
-+ fi
-+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
-+ $GREP . >/dev/null; then
-+ $ECHO
-+ if test "X$deplibs_check_method" = "Xnone"; then
-+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-+ else
-+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-+ fi
-+ $ECHO "*** All declared inter-library dependencies are being dropped."
-+ droppeddeps=yes
-+ fi
-+ ;;
-+ esac
-+ versuffix=$versuffix_save
-+ major=$major_save
-+ release=$release_save
-+ libname=$libname_save
-+ name=$name_save
-+
-+ case $host in
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # On Rhapsody replace the C library with the System framework
-+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+ ;;
-+ esac
-+
-+ if test "$droppeddeps" = yes; then
-+ if test "$module" = yes; then
-+ $ECHO
-+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
-+ $ECHO "*** a static module, that should work as long as the dlopening"
-+ $ECHO "*** application is linked with the -dlopen flag."
-+ if test -z "$global_symbol_pipe"; then
-+ $ECHO
-+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+ $ECHO "*** not find such a program. So, this module is probably useless."
-+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+ fi
-+ if test "$build_old_libs" = no; then
-+ oldlibs="$output_objdir/$libname.$libext"
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ else
-+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
-+ $ECHO "*** automatically added whenever a program is linked with this library"
-+ $ECHO "*** or is declared to -dlopen it."
-+
-+ if test "$allow_undefined" = no; then
-+ $ECHO
-+ $ECHO "*** Since this library must not contain undefined symbols,"
-+ $ECHO "*** because either the platform does not support them or"
-+ $ECHO "*** it was explicitly requested with -no-undefined,"
-+ $ECHO "*** libtool will only create a static version of it."
-+ if test "$build_old_libs" = no; then
-+ oldlibs="$output_objdir/$libname.$libext"
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ fi
-+ fi
-+ fi
-+ # Done checking deplibs!
-+ deplibs=$newdeplibs
-+ fi
-+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+ case $host in
-+ *-*-darwin*)
-+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ ;;
-+ esac
-+
-+ # move library search paths that coincide with paths to not yet
-+ # installed libraries to the beginning of the library search list
-+ new_libs=
-+ for path in $notinst_path; do
-+ case " $new_libs " in
-+ *" -L$path/$objdir "*) ;;
-+ *)
-+ case " $deplibs " in
-+ *" -L$path/$objdir "*)
-+ new_libs="$new_libs -L$path/$objdir" ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ for deplib in $deplibs; do
-+ case $deplib in
-+ -L*)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ done
-+ deplibs="$new_libs"
-+
-+ # All the library-specific variables (install_libdir is set above).
-+ library_names=
-+ old_library=
-+ dlname=
-+
-+ # Test again, we may have decided not to build it any more
-+ if test "$build_libtool_libs" = yes; then
-+ if test "$hardcode_into_libs" = yes; then
-+ # Hardcode the library paths
-+ hardcode_libdirs=
-+ dep_rpath=
-+ rpath="$finalize_rpath"
-+ test "$mode" != relink && rpath="$compile_rpath$rpath"
-+ for libdir in $rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ dep_rpath="$dep_rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ if test -n "$hardcode_libdir_flag_spec_ld"; then
-+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ else
-+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+ fi
-+ fi
-+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+ fi
-+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+ fi
-+
-+ shlibpath="$finalize_shlibpath"
-+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+ if test -n "$shlibpath"; then
-+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+ fi
-+
-+ # Get the real and link names of the library.
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval library_names=\"$library_names_spec\"
-+ set dummy $library_names
-+ shift
-+ realname="$1"
-+ shift
-+
-+ if test -n "$soname_spec"; then
-+ eval soname=\"$soname_spec\"
-+ else
-+ soname="$realname"
-+ fi
-+ if test -z "$dlname"; then
-+ dlname=$soname
-+ fi
-+
-+ lib="$output_objdir/$realname"
-+ linknames=
-+ for link
-+ do
-+ linknames="$linknames $link"
-+ done
-+
-+ # Use standard objects if they are pic
-+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ test "X$libobjs" = "X " && libobjs=
-+
-+ delfiles=
-+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-+ export_symbols="$output_objdir/$libname.uexp"
-+ delfiles="$delfiles $export_symbols"
-+ fi
-+
-+ orig_export_symbols=
-+ case $host_os in
-+ cygwin* | mingw*)
-+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-+ # exporting using user supplied symfile
-+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-+ # and it's NOT already a .def file. Must figure out
-+ # which of the given symbols are data symbols and tag
-+ # them as such. So, trigger use of export_symbols_cmds.
-+ # export_symbols gets reassigned inside the "prepare
-+ # the list of exported symbols" if statement, so the
-+ # include_expsyms logic still works.
-+ orig_export_symbols="$export_symbols"
-+ export_symbols=
-+ always_export_symbols=yes
-+ fi
-+ fi
-+ ;;
-+ esac
-+
-+ # Prepare the list of exported symbols
-+ if test -z "$export_symbols"; then
-+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+ func_echo "generating symbol list for \`$libname.la'"
-+ export_symbols="$output_objdir/$libname.exp"
-+ $opt_dry_run || $RM $export_symbols
-+ cmds=$export_symbols_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ if len=`expr "X$cmd" : ".*"` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ func_show_eval "$cmd" 'exit $?'
-+ skipped_export=false
-+ else
-+ # The command line is too long to execute in one step.
-+ func_echo "using reloadable object file for export list..."
-+ skipped_export=:
-+ # Break out early, otherwise skipped_export may be
-+ # set to false by a later but shorter cmd.
-+ break
-+ fi
-+ done
-+ IFS="$save_ifs"
-+ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-+ fi
-+ fi
-+ fi
-+
-+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+ tmp_export_symbols="$export_symbols"
-+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+ fi
-+
-+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-+ # The given exports_symbols file has to be filtered, so filter it.
-+ func_echo "filter symbol list for \`$libname.la' to tag DATA exports"
-+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+ # 's' commands which not all seds can handle. GNU sed should be fine
-+ # though. Also, the filter scales superlinearly with the number of
-+ # global variables. join(1) would be nice here, but unfortunately
-+ # isn't a blessed tool.
-+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+ export_symbols=$output_objdir/$libname.def
-+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-+ fi
-+
-+ tmp_deplibs=
-+ for test_deplib in $deplibs; do
-+ case " $convenience " in
-+ *" $test_deplib "*) ;;
-+ *)
-+ tmp_deplibs="$tmp_deplibs $test_deplib"
-+ ;;
-+ esac
-+ done
-+ deplibs="$tmp_deplibs"
-+
-+ if test -n "$convenience"; then
-+ if test -n "$whole_archive_flag_spec" &&
-+ test "$compiler_needs_object" = yes &&
-+ test -z "$libobjs"; then
-+ # extract the archives, so we have objects to list.
-+ # TODO: could optimize this to just extract one archive.
-+ whole_archive_flag_spec=
-+ fi
-+ if test -n "$whole_archive_flag_spec"; then
-+ save_libobjs=$libobjs
-+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+ test "X$libobjs" = "X " && libobjs=
-+ else
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $convenience
-+ libobjs="$libobjs $func_extract_archives_result"
-+ test "X$libobjs" = "X " && libobjs=
-+ fi
-+ fi
-+
-+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+ eval flag=\"$thread_safe_flag_spec\"
-+ linker_flags="$linker_flags $flag"
-+ fi
-+
-+ # Make a backup of the uninstalled library when relinking
-+ if test "$mode" = relink; then
-+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-+ fi
-+
-+ # Do each of the archive commands.
-+ if test "$module" = yes && test -n "$module_cmds" ; then
-+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+ eval test_cmds=\"$module_expsym_cmds\"
-+ cmds=$module_expsym_cmds
-+ else
-+ eval test_cmds=\"$module_cmds\"
-+ cmds=$module_cmds
-+ fi
-+ else
-+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+ eval test_cmds=\"$archive_expsym_cmds\"
-+ cmds=$archive_expsym_cmds
-+ else
-+ eval test_cmds=\"$archive_cmds\"
-+ cmds=$archive_cmds
-+ fi
-+ fi
-+
-+ if test "X$skipped_export" != "X:" &&
-+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ :
-+ else
-+ # The command line is too long to link in one step, link piecewise
-+ # or, if using GNU ld and skipped_export is not :, use a linker
-+ # script.
-+
-+ # Save the value of $output and $libobjs because we want to
-+ # use them later. If we have whole_archive_flag_spec, we
-+ # want to use save_libobjs as it was before
-+ # whole_archive_flag_spec was expanded, because we can't
-+ # assume the linker understands whole_archive_flag_spec.
-+ # This may have to be revisited, in case too many
-+ # convenience libraries get linked in and end up exceeding
-+ # the spec.
-+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-+ save_libobjs=$libobjs
-+ fi
-+ save_output=$output
-+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-+
-+ # Clear the reloadable object creation command queue and
-+ # initialize k to one.
-+ test_cmds=
-+ concat_cmds=
-+ objlist=
-+ last_robj=
-+ k=1
-+
-+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-+ output=${output_objdir}/${output_la}.lnkscript
-+ func_echo "creating GNU ld script: $output"
-+ $ECHO 'INPUT (' > $output
-+ for obj in $save_libobjs
-+ do
-+ $ECHO "$obj" >> $output
-+ done
-+ $ECHO ')' >> $output
-+ delfiles="$delfiles $output"
-+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-+ output=${output_objdir}/${output_la}.lnk
-+ func_echo "creating linker input file list: $output"
-+ : > $output
-+ set x $save_libobjs
-+ shift
-+ firstobj=
-+ if test "$compiler_needs_object" = yes; then
-+ firstobj="$1 "
-+ shift
-+ fi
-+ for obj
-+ do
-+ $ECHO "$obj" >> $output
-+ done
-+ delfiles="$delfiles $output"
-+ output=$firstobj\"$file_list_spec$output\"
-+ else
-+ if test -n "$save_libobjs"; then
-+ func_echo "creating reloadable object files..."
-+ output=$output_objdir/$output_la-${k}.$objext
-+ # Loop over the list of objects to be linked.
-+ for obj in $save_libobjs
-+ do
-+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-+ if test "X$objlist" = X ||
-+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-+ test "$len" -le "$max_cmd_len"; }; then
-+ objlist="$objlist $obj"
-+ else
-+ # The command $test_cmds is almost too long, add a
-+ # command to the queue.
-+ if test "$k" -eq 1 ; then
-+ # The first file doesn't have a previous command to add.
-+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+ else
-+ # All subsequent reloadable object files will link in
-+ # the last one created.
-+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-+ fi
-+ last_robj=$output_objdir/$output_la-${k}.$objext
-+ k=`expr $k + 1`
-+ output=$output_objdir/$output_la-${k}.$objext
-+ objlist=$obj
-+ len=1
-+ fi
-+ done
-+ # Handle the remaining objects by creating one last
-+ # reloadable object file. All subsequent reloadable object
-+ # files will link in the last one created.
-+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+
-+ # Set up a command to remove the reloadable object files
-+ # after they are used.
-+ i=0
-+ while test "$i" -lt "$k"
-+ do
-+ i=`expr $i + 1`
-+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-+ done
-+ else
-+ output=
-+ fi
-+
-+ if ${skipped_export-false}; then
-+ func_echo "generating symbol list for \`$libname.la'"
-+ export_symbols="$output_objdir/$libname.exp"
-+ $opt_dry_run || $RM $export_symbols
-+ libobjs=$output
-+ # Append the command to create the export file.
-+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-+ fi
-+
-+ test -n "$save_libobjs" &&
-+ func_echo "creating a temporary reloadable object file: $output"
-+
-+ # Loop through the commands generated above and execute them.
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $concat_cmds; do
-+ IFS="$save_ifs"
-+ $opt_silent || {
-+ func_quote_for_expand "$cmd"
-+ eval "func_echo $func_quote_for_expand_result"
-+ }
-+ $opt_dry_run || eval "$cmd" || {
-+ lt_exit=$?
-+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ ( cd "$output_objdir" && \
-+ $RM "${realname}T" && \
-+ $MV "${realname}U" "$realname" )
-+ fi
-+
-+ exit $lt_exit
-+ }
-+ done
-+ IFS="$save_ifs"
-+
-+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-+ fi
-+ fi
-+
-+ if ${skipped_export-false}; then
-+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+ tmp_export_symbols="$export_symbols"
-+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+ fi
-+
-+ if test -n "$orig_export_symbols"; then
-+ # The given exports_symbols file has to be filtered, so filter it.
-+ func_echo "filter symbol list for \`$libname.la' to tag DATA exports"
-+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+ # 's' commands which not all seds can handle. GNU sed should be fine
-+ # though. Also, the filter scales superlinearly with the number of
-+ # global variables. join(1) would be nice here, but unfortunately
-+ # isn't a blessed tool.
-+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+ export_symbols=$output_objdir/$libname.def
-+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-+ fi
-+ fi
-+
-+ libobjs=$output
-+ # Restore the value of output.
-+ output=$save_output
-+
-+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+ test "X$libobjs" = "X " && libobjs=
-+ fi
-+ # Expand the library linking commands again to reset the
-+ # value of $libobjs for piecewise linking.
-+
-+ # Do each of the archive commands.
-+ if test "$module" = yes && test -n "$module_cmds" ; then
-+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+ cmds=$module_expsym_cmds
-+ else
-+ cmds=$module_cmds
-+ fi
-+ else
-+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+ cmds=$archive_expsym_cmds
-+ else
-+ cmds=$archive_cmds
-+ fi
-+ fi
-+ fi
-+
-+ if test -n "$delfiles"; then
-+ # Append the command to remove temporary files to $cmds.
-+ eval cmds=\"\$cmds~\$RM $delfiles\"
-+ fi
-+
-+ # Add any objects from preloaded convenience libraries
-+ if test -n "$dlprefiles"; then
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $dlprefiles
-+ libobjs="$libobjs $func_extract_archives_result"
-+ test "X$libobjs" = "X " && libobjs=
-+ fi
-+
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $opt_silent || {
-+ func_quote_for_expand "$cmd"
-+ eval "func_echo $func_quote_for_expand_result"
-+ }
-+ $opt_dry_run || eval "$cmd" || {
-+ lt_exit=$?
-+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ ( cd "$output_objdir" && \
-+ $RM "${realname}T" && \
-+ $MV "${realname}U" "$realname" )
-+ fi
-+
-+ exit $lt_exit
-+ }
-+ done
-+ IFS="$save_ifs"
-+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-+
-+ if test -n "$convenience"; then
-+ if test -z "$whole_archive_flag_spec"; then
-+ func_show_eval '${RM}r "$gentop"'
-+ fi
-+ fi
-+
-+ exit $EXIT_SUCCESS
-+ fi
-+
-+ # Create links to the real library.
-+ for linkname in $linknames; do
-+ if test "$realname" != "$linkname"; then
-+ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-+ fi
-+ done
-+
-+ # If -module or -export-dynamic was specified, set the dlname.
-+ if test "$module" = yes || test "$export_dynamic" = yes; then
-+ # On all known operating systems, these are identical.
-+ dlname="$soname"
-+ fi
-+ fi
-+ ;;
-+
-+ obj)
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ func_warning "\`-dlopen' is ignored for objects"
-+ fi
-+
-+ test -n "$deplibs" && \
-+ func_warning "\`-l' and \`-L' are ignored for objects"
-+
-+ test -n "$rpath" && \
-+ func_warning "\`-rpath' is ignored for objects"
-+
-+ test -n "$xrpath" && \
-+ func_warning "\`-R' is ignored for objects"
-+
-+ test -n "$vinfo" && \
-+ func_warning "\`-version-info' is ignored for objects"
-+
-+ test -n "$release" && \
-+ func_warning "\`-release' is ignored for objects"
-+
-+ case $output in
-+ *.lo)
-+ test -n "$objs$old_deplibs" && \
-+ func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-+
-+ libobj=$output
-+ func_lo2o "$libobj"
-+ obj=$func_lo2o_result
-+ ;;
-+ *)
-+ libobj=
-+ obj="$output"
-+ ;;
-+ esac
-+
-+ # Delete the old objects.
-+ $opt_dry_run || $RM $obj $libobj
-+
-+ # Objects from convenience libraries. This assumes
-+ # single-version convenience libraries. Whenever we create
-+ # different ones for PIC/non-PIC, this we'll have to duplicate
-+ # the extraction.
-+ reload_conv_objs=
-+ gentop=
-+ # reload_cmds runs $LD directly, so let us get rid of
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
-+ wl=
-+
-+ if test -n "$convenience"; then
-+ if test -n "$whole_archive_flag_spec"; then
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-+ else
-+ gentop="$output_objdir/${obj}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $convenience
-+ reload_conv_objs="$reload_objs $func_extract_archives_result"
-+ fi
-+ fi
-+
-+ # Create the old-style object.
-+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+ output="$obj"
-+ func_execute_cmds "$reload_cmds" 'exit $?'
-+
-+ # Exit if we aren't doing a library object file.
-+ if test -z "$libobj"; then
-+ if test -n "$gentop"; then
-+ func_show_eval '${RM}r "$gentop"'
-+ fi
-+
-+ exit $EXIT_SUCCESS
-+ fi
-+
-+ if test "$build_libtool_libs" != yes; then
-+ if test -n "$gentop"; then
-+ func_show_eval '${RM}r "$gentop"'
-+ fi
-+
-+ # Create an invalid libtool object if no PIC, so that we don't
-+ # accidentally link it into a program.
-+ # $show "echo timestamp > $libobj"
-+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-+ exit $EXIT_SUCCESS
-+ fi
-+
-+ if test -n "$pic_flag" || test "$pic_mode" != default; then
-+ # Only do commands if we really have different PIC objects.
-+ reload_objs="$libobjs $reload_conv_objs"
-+ output="$libobj"
-+ func_execute_cmds "$reload_cmds" 'exit $?'
-+ fi
-+
-+ if test -n "$gentop"; then
-+ func_show_eval '${RM}r "$gentop"'
-+ fi
-+
-+ exit $EXIT_SUCCESS
-+ ;;
-+
-+ prog)
-+ case $host in
-+ *cygwin*) func_stripname '' '.exe' "$output"
-+ output=$func_stripname_result.exe;;
-+ esac
-+ test -n "$vinfo" && \
-+ func_warning "\`-version-info' is ignored for programs"
-+
-+ test -n "$release" && \
-+ func_warning "\`-release' is ignored for programs"
-+
-+ test "$preload" = yes \
-+ && test "$dlopen_support" = unknown \
-+ && test "$dlopen_self" = unknown \
-+ && test "$dlopen_self_static" = unknown && \
-+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-+
-+ case $host in
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # On Rhapsody replace the C library is the System framework
-+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+ ;;
-+ esac
-+
-+ case $host in
-+ *-*-darwin*)
-+ # Don't allow lazy linking, it breaks C++ global constructors
-+ # But is supposedly fixed on 10.4 or later (yay!).
-+ if test "$tagname" = CXX ; then
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-+ 10.[0123])
-+ compile_command="$compile_command ${wl}-bind_at_load"
-+ finalize_command="$finalize_command ${wl}-bind_at_load"
-+ ;;
-+ esac
-+ fi
-+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+ ;;
-+ esac
-+
-+
-+ # move library search paths that coincide with paths to not yet
-+ # installed libraries to the beginning of the library search list
-+ new_libs=
-+ for path in $notinst_path; do
-+ case " $new_libs " in
-+ *" -L$path/$objdir "*) ;;
-+ *)
-+ case " $compile_deplibs " in
-+ *" -L$path/$objdir "*)
-+ new_libs="$new_libs -L$path/$objdir" ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ for deplib in $compile_deplibs; do
-+ case $deplib in
-+ -L*)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ done
-+ compile_deplibs="$new_libs"
-+
-+
-+ compile_command="$compile_command $compile_deplibs"
-+ finalize_command="$finalize_command $finalize_deplibs"
-+
-+ if test -n "$rpath$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ for libdir in $rpath $xrpath; do
-+ # This is the magic to use -rpath.
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ fi
-+
-+ # Now hardcode the library paths
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $compile_rpath $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-+ case :$dllsearchpath: in
-+ *":$libdir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$libdir";;
-+ esac
-+ case :$dllsearchpath: in
-+ *":$testbindir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$testbindir";;
-+ esac
-+ ;;
-+ esac
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ compile_rpath="$rpath"
-+
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$finalize_perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ finalize_rpath="$rpath"
-+
-+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+ # Transform all the library objects into standard objects.
-+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ fi
-+
-+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-+
-+ # template prelinking step
-+ if test -n "$prelink_cmds"; then
-+ func_execute_cmds "$prelink_cmds" 'exit $?'
-+ fi
-+
-+ wrappers_required=yes
-+ case $host in
-+ *cygwin* | *mingw* )
-+ if test "$build_libtool_libs" != yes; then
-+ wrappers_required=no
-+ fi
-+ ;;
-+ *)
-+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-+ wrappers_required=no
-+ fi
-+ ;;
-+ esac
-+ if test "$wrappers_required" = no; then
-+ # Replace the output file specification.
-+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ link_command="$compile_command$compile_rpath"
-+
-+ # We have no uninstalled library dependencies, so finalize right now.
-+ exit_status=0
-+ func_show_eval "$link_command" 'exit_status=$?'
-+
-+ # Delete the generated files.
-+ if test -f "$output_objdir/${outputname}S.${objext}"; then
-+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-+ fi
-+
-+ exit $exit_status
-+ fi
-+
-+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+ fi
-+ if test -n "$finalize_shlibpath"; then
-+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+ fi
-+
-+ compile_var=
-+ finalize_var=
-+ if test -n "$runpath_var"; then
-+ if test -n "$perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+ fi
-+ if test -n "$finalize_perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $finalize_perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+ fi
-+ fi
-+
-+ if test "$no_install" = yes; then
-+ # We don't need to create a wrapper script.
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ # Replace the output file specification.
-+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ # Delete the old output file.
-+ $opt_dry_run || $RM $output
-+ # Link the executable and exit
-+ func_show_eval "$link_command" 'exit $?'
-+ exit $EXIT_SUCCESS
-+ fi
-+
-+ if test "$hardcode_action" = relink; then
-+ # Fast installation is not supported
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+ func_warning "this platform does not like uninstalled shared libraries"
-+ func_warning "\`$output' will be relinked during installation"
-+ else
-+ if test "$fast_install" != no; then
-+ link_command="$finalize_var$compile_command$finalize_rpath"
-+ if test "$fast_install" = yes; then
-+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ else
-+ # fast_install is set to needless
-+ relink_command=
-+ fi
-+ else
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ relink_command="$finalize_var$finalize_command$finalize_rpath"
-+ fi
-+ fi
-+
-+ # Replace the output file specification.
-+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+ # Delete the old output files.
-+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+ func_show_eval "$link_command" 'exit $?'
-+
-+ # Now create the wrapper script.
-+ func_echo "creating $output"
-+
-+ # Quote the relink command for shipping.
-+ if test -n "$relink_command"; then
-+ # Preserve any variables that may affect compiler behavior
-+ for var in $variables_saved_for_relink; do
-+ if eval test -z \"\${$var+set}\"; then
-+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-+ elif eval var_value=\$$var; test -z "$var_value"; then
-+ relink_command="$var=; export $var; $relink_command"
-+ else
-+ func_quote_for_eval "$var_value"
-+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-+ fi
-+ done
-+ relink_command="(cd `pwd`; $relink_command)"
-+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ fi
-+
-+ # Quote $ECHO for shipping.
-+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-+ case $progpath in
-+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-+ esac
-+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+ else
-+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-+ fi
-+
-+ # Only actually do things if not in dry run mode.
-+ $opt_dry_run || {
-+ # win32 will think the script is a binary if it has
-+ # a .exe suffix, so we strip it off here.
-+ case $output in
-+ *.exe) func_stripname '' '.exe' "$output"
-+ output=$func_stripname_result ;;
-+ esac
-+ # test for cygwin because mv fails w/o .exe extensions
-+ case $host in
-+ *cygwin*)
-+ exeext=.exe
-+ func_stripname '' '.exe' "$outputname"
-+ outputname=$func_stripname_result ;;
-+ *) exeext= ;;
-+ esac
-+ case $host in
-+ *cygwin* | *mingw* )
-+ output_name=`basename $output`
-+ output_path=`dirname $output`
-+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
-+ cwrapper="$output_path/$output_name.exe"
-+ $RM $cwrappersource $cwrapper
-+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-+
-+ cat > $cwrappersource <<EOF
-+
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+
-+ The $output program cannot be directly executed until all the libtool
-+ libraries that it depends on are installed.
-+
-+ This wrapper executable should never be moved out of the build directory.
-+ If it is, it will not operate correctly.
-+
-+ Currently, it simply execs the wrapper *script* "/bin/sh $output",
-+ but could eventually absorb all of the scripts functionality and
-+ exec $objdir/$outputname directly.
-+*/
-+EOF
-+ cat >> $cwrappersource<<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <sys/stat.h>
-+
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
-+#else
-+# define LT_PATHMAX 1024
-+#endif
-+
-+#ifndef DIR_SEPARATOR
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
-+#endif
-+
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+ defined (__OS2__)
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# ifndef DIR_SEPARATOR_2
-+# define DIR_SEPARATOR_2 '\\'
-+# endif
-+# ifndef PATH_SEPARATOR_2
-+# define PATH_SEPARATOR_2 ';'
-+# endif
-+#endif
-+
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else /* DIR_SEPARATOR_2 */
-+# define IS_DIR_SEPARATOR(ch) \
-+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif /* DIR_SEPARATOR_2 */
-+
-+#ifndef PATH_SEPARATOR_2
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-+#else /* PATH_SEPARATOR_2 */
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-+#endif /* PATH_SEPARATOR_2 */
-+
-+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+ if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
-+
-+/* -DDEBUG is fairly common in CFLAGS. */
-+#undef DEBUG
-+#if defined DEBUGWRAPPER
-+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-+#else
-+# define DEBUG(format, ...)
-+#endif
-+
-+const char *program_name = NULL;
-+
-+void * xmalloc (size_t num);
-+char * xstrdup (const char *string);
-+const char * base_name (const char *name);
-+char * find_executable(const char *wrapper);
-+int check_executable(const char *path);
-+char * strendzap(char *str, const char *pat);
-+void lt_fatal (const char *message, ...);
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ char **newargz;
-+ int i;
-+
-+ program_name = (char *) xstrdup (base_name (argv[0]));
-+ DEBUG("(main) argv[0] : %s\n",argv[0]);
-+ DEBUG("(main) program_name : %s\n",program_name);
-+ newargz = XMALLOC(char *, argc+2);
-+EOF
-+
-+ cat >> $cwrappersource <<EOF
-+ newargz[0] = (char *) xstrdup("$SHELL");
-+EOF
-+
-+ cat >> $cwrappersource <<"EOF"
-+ newargz[1] = find_executable(argv[0]);
-+ if (newargz[1] == NULL)
-+ lt_fatal("Couldn't find %s", argv[0]);
-+ DEBUG("(main) found exe at : %s\n",newargz[1]);
-+ /* we know the script has the same name, without the .exe */
-+ /* so make sure newargz[1] doesn't end in .exe */
-+ strendzap(newargz[1],".exe");
-+ for (i = 1; i < argc; i++)
-+ newargz[i+1] = xstrdup(argv[i]);
-+ newargz[argc+1] = NULL;
-+
-+ for (i=0; i<argc+1; i++)
-+ {
-+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
-+ ;
-+ }
-+
-+EOF
-+
-+ case $host_os in
-+ mingw*)
-+ cat >> $cwrappersource <<EOF
-+ execv("$SHELL",(char const **)newargz);
-+EOF
-+ ;;
-+ *)
-+ cat >> $cwrappersource <<EOF
-+ execv("$SHELL",newargz);
-+EOF
-+ ;;
-+ esac
-+
-+ cat >> $cwrappersource <<"EOF"
-+ return 127;
-+}
-+
-+void *
-+xmalloc (size_t num)
-+{
-+ void * p = (void *) malloc (num);
-+ if (!p)
-+ lt_fatal ("Memory exhausted");
-+
-+ return p;
-+}
-+
-+char *
-+xstrdup (const char *string)
-+{
-+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-+;
-+}
-+
-+const char *
-+base_name (const char *name)
-+{
-+ const char *base;
-+
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ /* Skip over the disk name in MSDOS pathnames. */
-+ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-+ name += 2;
-+#endif
-+
-+ for (base = name; *name; name++)
-+ if (IS_DIR_SEPARATOR (*name))
-+ base = name + 1;
-+ return base;
-+}
-+
-+int
-+check_executable(const char * path)
-+{
-+ struct stat st;
-+
-+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-+ if ((!path) || (!*path))
-+ return 0;
-+
-+ if ((stat (path, &st) >= 0) &&
-+ (
-+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-+#if defined (S_IXOTH)
-+ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-+#endif
-+#if defined (S_IXGRP)
-+ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-+#endif
-+ ((st.st_mode & S_IXUSR) == S_IXUSR))
-+ )
-+ return 1;
-+ else
-+ return 0;
-+}
-+
-+/* Searches for the full path of the wrapper. Returns
-+ newly allocated full path name if found, NULL otherwise */
-+char *
-+find_executable (const char* wrapper)
-+{
-+ int has_slash = 0;
-+ const char* p;
-+ const char* p_next;
-+ /* static buffer for getcwd */
-+ char tmp[LT_PATHMAX + 1];
-+ int tmp_len;
-+ char* concat_name;
-+
-+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-+
-+ if ((wrapper == NULL) || (*wrapper == '\0'))
-+ return NULL;
-+
-+ /* Absolute path? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-+ {
-+ concat_name = xstrdup (wrapper);
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
-+ else
-+ {
-+#endif
-+ if (IS_DIR_SEPARATOR (wrapper[0]))
-+ {
-+ concat_name = xstrdup (wrapper);
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ }
-+#endif
-+
-+ for (p = wrapper; *p; p++)
-+ if (*p == '/')
-+ {
-+ has_slash = 1;
-+ break;
-+ }
-+ if (!has_slash)
-+ {
-+ /* no slashes; search PATH */
-+ const char* path = getenv ("PATH");
-+ if (path != NULL)
-+ {
-+ for (p = path; *p; p = p_next)
-+ {
-+ const char* q;
-+ size_t p_len;
-+ for (q = p; *q; q++)
-+ if (IS_PATH_SEPARATOR(*q))
-+ break;
-+ p_len = q - p;
-+ p_next = (*q == '\0' ? q : q + 1);
-+ if (p_len == 0)
-+ {
-+ /* empty path: current directory */
-+ if (getcwd (tmp, LT_PATHMAX) == NULL)
-+ lt_fatal ("getcwd failed");
-+ tmp_len = strlen(tmp);
-+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, tmp, tmp_len);
-+ concat_name[tmp_len] = '/';
-+ strcpy (concat_name + tmp_len + 1, wrapper);
-+ }
-+ else
-+ {
-+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, p, p_len);
-+ concat_name[p_len] = '/';
-+ strcpy (concat_name + p_len + 1, wrapper);
-+ }
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
-+ }
-+ /* not found in PATH; assume curdir */
-+ }
-+ /* Relative path | not found in path: prepend cwd */
-+ if (getcwd (tmp, LT_PATHMAX) == NULL)
-+ lt_fatal ("getcwd failed");
-+ tmp_len = strlen(tmp);
-+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, tmp, tmp_len);
-+ concat_name[tmp_len] = '/';
-+ strcpy (concat_name + tmp_len + 1, wrapper);
-+
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ return NULL;
-+}
-+
-+char *
-+strendzap(char *str, const char *pat)
-+{
-+ size_t len, patlen;
-+
-+ assert(str != NULL);
-+ assert(pat != NULL);
-+
-+ len = strlen(str);
-+ patlen = strlen(pat);
-+
-+ if (patlen <= len)
-+ {
-+ str += len - patlen;
-+ if (strcmp(str, pat) == 0)
-+ *str = '\0';
-+ }
-+ return str;
-+}
-+
-+static void
-+lt_error_core (int exit_status, const char * mode,
-+ const char * message, va_list ap)
-+{
-+ fprintf (stderr, "%s: %s: ", program_name, mode);
-+ vfprintf (stderr, message, ap);
-+ fprintf (stderr, ".\n");
-+
-+ if (exit_status >= 0)
-+ exit (exit_status);
-+}
-+
-+void
-+lt_fatal (const char *message, ...)
-+{
-+ va_list ap;
-+ va_start (ap, message);
-+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+ va_end (ap);
-+}
-+EOF
-+ # we should really use a build-platform specific compiler
-+ # here, but OTOH, the wrappers (shell script and this C one)
-+ # are only useful if you want to execute the "real" binary.
-+ # Since the "real" binary is built for $host, then this
-+ # wrapper might as well be built for $host, too.
-+ $opt_dry_run || $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-+ ;;
-+ esac
-+ $RM $output
-+ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-+
-+ $ECHO > $output "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# Be Bourne compatible
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# 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
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+ # install mode needs the following variables:
-+ generated_by_libtool_version='$macro_version'
-+ notinst_deplibs='$notinst_deplibs'
-+else
-+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
-+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+ ECHO=\"$qecho\"
-+ file=\"\$0\"
-+ # Make sure echo works.
-+ if test \"X\$1\" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-+ # Yippee, \$ECHO works!
-+ :
-+ else
-+ # Restart under the correct shell, and then maybe \$ECHO will work.
-+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+ fi
-+ fi\
-+"
-+ $ECHO >> $output "\
-+
-+ # Find the directory that this script lives in.
-+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+ # Follow symbolic links until we get to the real thisdir.
-+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+ while test -n \"\$file\"; do
-+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+ # If there was a directory component, then change thisdir.
-+ if test \"x\$destdir\" != \"x\$file\"; then
-+ case \"\$destdir\" in
-+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+ *) thisdir=\"\$thisdir/\$destdir\" ;;
-+ esac
-+ fi
-+
-+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+ done
-+
-+ # Try to get the absolute directory name.
-+ absdir=\`cd \"\$thisdir\" && pwd\`
-+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+ if test "$fast_install" = yes; then
-+ $ECHO >> $output "\
-+ program=lt-'$outputname'$exeext
-+ progdir=\"\$thisdir/$objdir\"
-+
-+ if test ! -f \"\$progdir/\$program\" ||
-+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+ file=\"\$\$-\$program\"
-+
-+ if test ! -d \"\$progdir\"; then
-+ $MKDIR \"\$progdir\"
-+ else
-+ $RM \"\$progdir/\$file\"
-+ fi"
-+
-+ $ECHO >> $output "\
-+
-+ # relink executable if necessary
-+ if test -n \"\$relink_command\"; then
-+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+ else
-+ $ECHO \"\$relink_command_output\" >&2
-+ $RM \"\$progdir/\$file\"
-+ exit 1
-+ fi
-+ fi
-+
-+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+ { $RM \"\$progdir/\$program\";
-+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+ $RM \"\$progdir/\$file\"
-+ fi"
-+ else
-+ $ECHO >> $output "\
-+ program='$outputname'
-+ progdir=\"\$thisdir/$objdir\"
-+"
-+ fi
-+
-+ $ECHO >> $output "\
-+
-+ if test -f \"\$progdir/\$program\"; then"
-+
-+ # Export our shlibpath_var if we have one.
-+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+ $ECHO >> $output "\
-+ # Add our own library path to $shlibpath_var
-+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
-+ # Some systems cannot cope with colon-terminated $shlibpath_var
-+ # The second colon is a workaround for a bug in BeOS R4 sed
-+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+
-+ export $shlibpath_var
-+"
-+ fi
-+
-+ # fixup the dll searchpath if we need to.
-+ if test -n "$dllsearchpath"; then
-+ $ECHO >> $output "\
-+ # Add the dll search path components to the executable PATH
-+ PATH=$dllsearchpath:\$PATH
-+"
-+ fi
-+
-+ $ECHO >> $output "\
-+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+ # Run the actual program with our arguments.
-+"
-+ case $host in
-+ # Backslashes separate directories on plain windows
-+ *-*-mingw | *-*-os2*)
-+ $ECHO >> $output "\
-+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+ ;;
-+
-+ *)
-+ $ECHO >> $output "\
-+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+ ;;
-+ esac
-+ $ECHO >> $output "\
-+ \$ECHO \"\$0: cannot exec \$program \$*\"
-+ exit 1
-+ fi
-+ else
-+ # The program doesn't exist.
-+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+ exit 1
-+ fi
-+fi\
-+"
-+ chmod +x $output
-+ }
-+ exit $EXIT_SUCCESS
-+ ;;
-+ esac
-+
-+ # See if we need to build an old-fashioned archive.
-+ for oldlib in $oldlibs; do
-+
-+ if test "$build_libtool_libs" = convenience; then
-+ oldobjs="$libobjs_save $symfileobj"
-+ addlibs="$convenience"
-+ build_libtool_libs=no
-+ else
-+ if test "$build_libtool_libs" = module; then
-+ oldobjs="$libobjs_save"
-+ build_libtool_libs=no
-+ else
-+ oldobjs="$old_deplibs $non_pic_objects"
-+ if test "$preload" = yes && test -f "$symfileobj"; then
-+ oldobjs="$oldobjs $symfileobj"
-+ fi
-+ fi
-+ addlibs="$old_convenience"
-+ fi
-+
-+ if test -n "$addlibs"; then
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $addlibs
-+ oldobjs="$oldobjs $func_extract_archives_result"
-+ fi
-+
-+ # Do each command in the archive commands.
-+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+ cmds=$old_archive_from_new_cmds
-+ else
-+
-+ # Add any objects from preloaded convenience libraries
-+ if test -n "$dlprefiles"; then
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $dlprefiles
-+ oldobjs="$oldobjs $func_extract_archives_result"
-+ fi
-+
-+ # POSIX demands no paths to be encoded in archives. We have
-+ # to avoid creating archives with duplicate basenames if we
-+ # might have to extract them afterwards, e.g., when creating a
-+ # static archive out of a convenience library, or when linking
-+ # the entirety of a libtool archive into another (currently
-+ # not supported by libtool).
-+ if (for obj in $oldobjs
-+ do
-+ func_basename "$obj"
-+ $ECHO "$func_basename_result"
-+ done | sort | sort -uc >/dev/null 2>&1); then
-+ :
-+ else
-+ $ECHO "copying selected object files to avoid basename conflicts..."
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+ func_mkdir_p "$gentop"
-+ save_oldobjs=$oldobjs
-+ oldobjs=
-+ counter=1
-+ for obj in $save_oldobjs
-+ do
-+ func_basename "$obj"
-+ objbase="$func_basename_result"
-+ case " $oldobjs " in
-+ " ") oldobjs=$obj ;;
-+ *[\ /]"$objbase "*)
-+ while :; do
-+ # Make sure we don't pick an alternate name that also
-+ # overlaps.
-+ newobj=lt$counter-$objbase
-+ counter=`expr $counter + 1`
-+ case " $oldobjs " in
-+ *[\ /]"$newobj "*) ;;
-+ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+ esac
-+ done
-+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+ oldobjs="$oldobjs $gentop/$newobj"
-+ ;;
-+ *) oldobjs="$oldobjs $obj" ;;
-+ esac
-+ done
-+ fi
-+ eval cmds=\"$old_archive_cmds\"
-+
-+ if len=`expr "X$cmds" : ".*" 2>/dev/null` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ cmds=$old_archive_cmds
-+ else
-+ # the command line is too long to link in one step, link in parts
-+ func_echo "using piecewise archive linking..."
-+ save_RANLIB=$RANLIB
-+ RANLIB=:
-+ objlist=
-+ concat_cmds=
-+ save_oldobjs=$oldobjs
-+ # Is there a better way of finding the last object in the list?
-+ for obj in $save_oldobjs
-+ do
-+ last_oldobj=$obj
-+ done
-+ for obj in $save_oldobjs
-+ do
-+ oldobjs="$objlist $obj"
-+ objlist="$objlist $obj"
-+ eval test_cmds=\"$old_archive_cmds\"
-+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-+ test "$len" -le "$max_cmd_len"; then
-+ :
-+ else
-+ # the above command should be used before it gets too long
-+ oldobjs=$objlist
-+ if test "$obj" = "$last_oldobj" ; then
-+ RANLIB=$save_RANLIB
-+ fi
-+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-+ objlist=
-+ fi
-+ done
-+ RANLIB=$save_RANLIB
-+ oldobjs=$objlist
-+ if test "X$oldobjs" = "X" ; then
-+ eval cmds=\"\$concat_cmds\"
-+ else
-+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-+ fi
-+ fi
-+ fi
-+ func_execute_cmds "$cmds" 'exit $?'
-+ done
-+
-+ test -n "$generated" && \
-+ func_show_eval "${RM}r$generated"
-+
-+ # Now create the libtool archive.
-+ case $output in
-+ *.la)
-+ old_library=
-+ test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ func_echo "creating $output"
-+
-+ # Preserve any variables that may affect compiler behavior
-+ for var in $variables_saved_for_relink; do
-+ if eval test -z \"\${$var+set}\"; then
-+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-+ elif eval var_value=\$$var; test -z "$var_value"; then
-+ relink_command="$var=; export $var; $relink_command"
-+ else
-+ func_quote_for_eval "$var_value"
-+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-+ fi
-+ done
-+ # Quote the link command for shipping.
-+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ if test "$hardcode_automatic" = yes ; then
-+ relink_command=
-+ fi
-+
-+ # Only create the output if not a dry run.
-+ $opt_dry_run || {
-+ for installed in no yes; do
-+ if test "$installed" = yes; then
-+ if test -z "$install_libdir"; then
-+ break
-+ fi
-+ output="$output_objdir/$outputname"i
-+ # Replace all uninstalled libtool libraries with the installed ones
-+ newdependency_libs=
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ *.la)
-+ func_basename "$deplib"
-+ name="$func_basename_result"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ test -z "$libdir" && \
-+ func_fatal_error "\`$deplib' is not a valid libtool archive"
-+ newdependency_libs="$newdependency_libs $libdir/$name"
-+ ;;
-+ *) newdependency_libs="$newdependency_libs $deplib" ;;
-+ esac
-+ done
-+ dependency_libs="$newdependency_libs"
-+ newdlfiles=
-+
-+ for lib in $dlfiles; do
-+ case $lib in
-+ *.la)
-+ func_basename "$lib"
-+ name="$func_basename_result"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ test -z "$libdir" && \
-+ func_fatal_error "\`$lib' is not a valid libtool archive"
-+ newdlfiles="$newdlfiles $libdir/$name"
-+ ;;
-+ *) newdlfiles="$newdlfiles $lib" ;;
-+ esac
-+ done
-+ dlfiles="$newdlfiles"
-+ newdlprefiles=
-+ for lib in $dlprefiles; do
-+ case $lib in
-+ *.la)
-+ # Only pass preopened files to the pseudo-archive (for
-+ # eventual linking with the app. that links it) if we
-+ # didn't already link the preopened objects directly into
-+ # the library:
-+ func_basename "$lib"
-+ name="$func_basename_result"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ test -z "$libdir" && \
-+ func_fatal_error "\`$lib' is not a valid libtool archive"
-+ newdlprefiles="$newdlprefiles $libdir/$name"
-+ ;;
-+ esac
-+ done
-+ dlprefiles="$newdlprefiles"
-+ else
-+ newdlfiles=
-+ for lib in $dlfiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlfiles="$newdlfiles $abs"
-+ done
-+ dlfiles="$newdlfiles"
-+ newdlprefiles=
-+ for lib in $dlprefiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlprefiles="$newdlprefiles $abs"
-+ done
-+ dlprefiles="$newdlprefiles"
-+ fi
-+ $RM $output
-+ # place dlname in correct position for cygwin
-+ tdlname=$dlname
-+ case $host,$output,$installed,$module,$dlname in
-+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+ esac
-+ $ECHO > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Linker flags that can not go in dependency_libs.
-+inherited_linker_flags='$new_inherited_linker_flags'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Names of additional weak libraries provided by this library
-+weak_library_names='$weak_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+ if test "$installed" = no && test "$need_relink" = yes; then
-+ $ECHO >> $output "\
-+relink_command=\"$relink_command\""
-+ fi
-+ done
-+ }
-+
-+ # Do a symbolic link so that the libtool archive can be found in
-+ # LD_LIBRARY_PATH before the program is installed.
-+ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-+ ;;
-+ esac
-+ exit $EXIT_SUCCESS
-+}
-+
-+{ test "$mode" = link || test "$mode" = relink; } &&
-+ func_mode_link ${1+"$@"}
-+
-+
-+# func_mode_uninstall arg...
-+func_mode_uninstall ()
-+{
-+ $opt_debug
-+ RM="$nonopt"
-+ files=
-+ rmforce=
-+ exit_status=0
-+
-+ # This variable tells wrapper scripts just to set variables rather
-+ # than running their programs.
-+ libtool_install_magic="$magic"
-+
-+ for arg
-+ do
-+ case $arg in
-+ -f) RM="$RM $arg"; rmforce=yes ;;
-+ -*) RM="$RM $arg" ;;
-+ *) files="$files $arg" ;;
-+ esac
-+ done
-+
-+ test -z "$RM" && \
-+ func_fatal_help "you must specify an RM program"
-+
-+ rmdirs=
-+
-+ origobjdir="$objdir"
-+ for file in $files; do
-+ func_dirname "$file" "" "."
-+ dir="$func_dirname_result"
-+ if test "X$dir" = X.; then
-+ objdir="$origobjdir"
-+ else
-+ objdir="$dir/$origobjdir"
-+ fi
-+ func_basename "$file"
-+ name="$func_basename_result"
-+ test "$mode" = uninstall && objdir="$dir"
-+
-+ # Remember objdir for removal later, being careful to avoid duplicates
-+ if test "$mode" = clean; then
-+ case " $rmdirs " in
-+ *" $objdir "*) ;;
-+ *) rmdirs="$rmdirs $objdir" ;;
-+ esac
-+ fi
-+
-+ # Don't error if the file doesn't exist and rm -f was used.
-+ if { test -L "$file"; } >/dev/null 2>&1 ||
-+ { test -h "$file"; } >/dev/null 2>&1 ||
-+ test -f "$file"; then
-+ :
-+ elif test -d "$file"; then
-+ exit_status=1
-+ continue
-+ elif test "$rmforce" = yes; then
-+ continue
-+ fi
-+
-+ rmfiles="$file"
-+
-+ case $name in
-+ *.la)
-+ # Possibly a libtool archive, so verify it.
-+ if func_lalib_p "$file"; then
-+ func_source $dir/$name
-+
-+ # Delete the libtool libraries and symlinks.
-+ for n in $library_names; do
-+ rmfiles="$rmfiles $objdir/$n"
-+ done
-+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+
-+ case "$mode" in
-+ clean)
-+ case " $library_names " in
-+ # " " in the beginning catches empty $dlname
-+ *" $dlname "*) ;;
-+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+ esac
-+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+ ;;
-+ uninstall)
-+ if test -n "$library_names"; then
-+ # Do each command in the postuninstall commands.
-+ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-+ fi
-+
-+ if test -n "$old_library"; then
-+ # Do each command in the old_postuninstall commands.
-+ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-+ fi
-+ # FIXME: should reinstall the best remaining shared library.
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ *.lo)
-+ # Possibly a libtool object, so verify it.
-+ if func_lalib_p "$file"; then
-+
-+ # Read the .lo file
-+ func_source $dir/$name
-+
-+ # Add PIC object to the list of files to remove.
-+ if test -n "$pic_object" &&
-+ test "$pic_object" != none; then
-+ rmfiles="$rmfiles $dir/$pic_object"
-+ fi
-+
-+ # Add non-PIC object to the list of files to remove.
-+ if test -n "$non_pic_object" &&
-+ test "$non_pic_object" != none; then
-+ rmfiles="$rmfiles $dir/$non_pic_object"
-+ fi
-+ fi
-+ ;;
-+
-+ *)
-+ if test "$mode" = clean ; then
-+ noexename=$name
-+ case $file in
-+ *.exe)
-+ func_stripname '' '.exe' "$file"
-+ file=$func_stripname_result
-+ func_stripname '' '.exe' "$name"
-+ noexename=$func_stripname_result
-+ # $file with .exe has already been added to rmfiles,
-+ # add $file without .exe
-+ rmfiles="$rmfiles $file"
-+ ;;
-+ esac
-+ # Do a test to see if this is a libtool program.
-+ if func_ltwrapper_p "$file"; then
-+ relink_command=
-+ func_source $dir/$noexename
-+
-+ # note $name still contains .exe if it was in $file originally
-+ # as does the version of $file that was added into $rmfiles
-+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+ if test "$fast_install" = yes && test -n "$relink_command"; then
-+ rmfiles="$rmfiles $objdir/lt-$name"
-+ fi
-+ if test "X$noexename" != "X$name" ; then
-+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ func_show_eval "$RM $rmfiles" 'exit_status=1'
-+ done
-+ objdir="$origobjdir"
-+
-+ # Try to remove the ${objdir}s in the directories where we deleted files
-+ for dir in $rmdirs; do
-+ if test -d "$dir"; then
-+ func_show_eval "rmdir $dir >/dev/null 2>&1"
-+ fi
-+ done
-+
-+ exit $exit_status
-+}
-+
-+{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+ func_mode_uninstall ${1+"$@"}
-+
-+test -z "$mode" && {
-+ help="$generic_help"
-+ func_fatal_help "you must specify a MODE"
-+}
-+
-+test -z "$exec_cmd" && \
-+ func_fatal_help "invalid operation mode \`$mode'"
-+
-+if test -n "$exec_cmd"; then
-+ eval exec "$exec_cmd"
-+ exit $EXIT_FAILURE
-+fi
-+
-+exit $exit_status
-+
-+
-+# The TAGs below are defined such that we never get into a situation
-+# in which we disable both kinds of libraries. Given conflicting
-+# choices, we go for a static library, that is the most portable,
-+# since we can't tell whether shared libraries were disabled because
-+# the user asked for that or because the platform doesn't support
-+# them. This is particularly important on AIX, because we don't
-+# support having both static and shared libraries enabled at the same
-+# time on that platform, so we default to a shared-only configuration.
-+# If a disable-shared tag is given, we'll fallback to a static-only
-+# configuration. But we'll never go from static-only to shared-only.
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-+build_libtool_libs=no
-+build_old_libs=yes
-+# ### END LIBTOOL TAG CONFIG: disable-shared
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-+# ### END LIBTOOL TAG CONFIG: disable-static
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
-+# vi:sw=2
---- a/bfd/Makefile.in
-+++ b/bfd/Makefile.in
-@@ -312,6 +312,7 @@ ALL_MACHINES = \
- cpu-arc.lo \
- cpu-arm.lo \
- cpu-avr.lo \
-+ cpu-avr32.lo \
- cpu-bfin.lo \
- cpu-cr16.lo \
- cpu-cr16c.lo \
-@@ -493,6 +494,7 @@ BFD32_BACKENDS = \
- elf32-arc.lo \
- elf32-arm.lo \
- elf32-avr.lo \
-+ elf32-avr32.lo \
- elf32-bfin.lo \
- elf32-cr16.lo \
- elf32-cr16c.lo \
-@@ -1908,6 +1910,10 @@ elf32-cr16.lo: elf32-cr16.c $(INCDIR)/fi
- $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/cr16.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-+elf32-avr32.lo: elf32-avr32.c $(INCDIR)/filenames.h elf-bfd.h \
-+ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+ $(INCDIR)/bfdlink.h $(INCDIR)/elf/avr32.h $(INCDIR)/elf/reloc-macros.h \
-+ elf32-target.h
- elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
- $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
---- /dev/null
-+++ b/bfd/po/Makefile.in
-@@ -0,0 +1,297 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright 2001, 2003, 2006 Free Software Foundation, Inc.
-+#
-+# This file may be copied and used freely without restrictions. It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+
-+PACKAGE = bfd
-+VERSION = 2.18.atmel.1.0.1.avr32linux.1
-+
-+SHELL = /bin/sh
-+
-+
-+srcdir = .
-+top_srcdir = ..
-+
-+top_builddir = ..
-+
-+prefix = /usr
-+exec_prefix = ${prefix}
-+datadir = $(prefix)/share
-+localedir = $(datadir)/locale
-+gnulocaledir = $(prefix)/share/locale
-+gettextsrcdir = $(prefix)/share/gettext/po
-+subdir = po
-+
-+DESTDIR =
-+
-+INSTALL = /usr/bin/install -c
-+INSTALL_DATA = ${INSTALL} -m 644
-+MKINSTALLDIRS = $(top_builddir)/./../mkinstalldirs
-+
-+CC = gcc
-+GENCAT = gencat
-+GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt
-+MSGFMT = /usr/bin/msgfmt
-+XGETTEXT = PATH=../src:$$PATH /usr/bin/xgettext
-+MSGMERGE = PATH=../src:$$PATH msgmerge
-+
-+DEFS = -DHAVE_CONFIG_H
-+CFLAGS = -g -O2
-+CPPFLAGS =
-+
-+INCLUDES = -I.. -I$(top_srcdir)/intl
-+
-+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-+
-+SOURCES = cat-id-tbl.c
-+POFILES = @POFILES@
-+GMOFILES = @GMOFILES@
-+DISTFILES = ChangeLog Makefile.in.in SRC-POTFILES.in BLD-POTFILES.in $(PACKAGE).pot \
-+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-+
-+# Note - the following line gets processed by bfd/configure and amended
-+# to contain the full list of source dir POTFILES.
-+SRC-POTFILES = \
-+
-+# Note - the following line gets processed by bfd/configure and amended
-+# to contain the full list of build dir POTFILES.
-+BLD-POTFILES = \
-+
-+CATALOGS = da.gmo es.gmo fr.gmo ja.gmo ro.gmo rw.gmo sv.gmo tr.gmo vi.gmo zh_CN.gmo da.gmo es.gmo fr.gmo ja.gmo ro.gmo rw.gmo sv.gmo tr.gmo vi.gmo zh_CN.gmo
-+CATOBJEXT = .gmo
-+INSTOBJEXT = .mo
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-+
-+.c.o:
-+ $(COMPILE) $<
-+
-+.po.pox:
-+ $(MAKE) $(PACKAGE).pot
-+ $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+ $(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+ file=`echo $* | sed 's,.*/,,'`.gmo \
-+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+ sed -f ../intl/po2msg.sed < $< > $*.msg \
-+ && rm -f $@ && $(GENCAT) $@ $*.msg
-+
-+
-+all: all-yes
-+
-+all-yes: $(CATALOGS) # $(PACKAGE).pot
-+all-no:
-+
-+$(srcdir)/$(PACKAGE).pot: $(SRC-POTFILES) $(BLD-POTFILES)
-+ $(XGETTEXT) --default-domain=$(PACKAGE) \
-+ --directory=$(top_srcdir) \
-+ --add-comments --keyword=_ --keyword=N_ \
-+ --msgid-bugs-address=bug-binutils@gnu.org \
-+ --files-from=$(srcdir)/SRC-POTFILES.in
-+ $(XGETTEXT) --default-domain=$(PACKAGE) \
-+ --directory=.. \
-+ --directory=. \
-+ --add-comments --keyword=_ --keyword=N_ \
-+ --join-existing \
-+ --msgid-bugs-address=bug-binutils@gnu.org \
-+ --files-from=$(srcdir)/BLD-POTFILES.in
-+ rm -f $(srcdir)/$(PACKAGE).pot
-+ mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
-+
-+$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-+$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-+ rm -f cat-id-tbl.tmp
-+ sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-+ | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-+ if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-+ rm cat-id-tbl.tmp; \
-+ else \
-+ echo cat-id-tbl.c changed; \
-+ rm -f $(srcdir)/cat-id-tbl.c; \
-+ mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-+ fi
-+ cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-+
-+
-+install: install-exec install-data
-+install-exec:
-+install-info:
-+install-html:
-+install-data: install-data-yes
-+install-data-no: all
-+install-data-yes: all
-+ if test -r $(MKINSTALLDIRS); then \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-+ else \
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-+ fi
-+ @catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ case "$$cat" in \
-+ *.gmo) destdir=$(gnulocaledir);; \
-+ *) destdir=$(localedir);; \
-+ esac; \
-+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-+ if test -r $(MKINSTALLDIRS); then \
-+ $(MKINSTALLDIRS) $$dir; \
-+ else \
-+ $(top_srcdir)/mkinstalldirs $$dir; \
-+ fi; \
-+ if test -r $$cat; then \
-+ $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+ echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+ else \
-+ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+ echo "installing $(srcdir)/$$cat as" \
-+ "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+ fi; \
-+ if test -r $$cat.m; then \
-+ $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+ echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+ else \
-+ if test -r $(srcdir)/$$cat.m ; then \
-+ $(INSTALL_DATA) $(srcdir)/$$cat.m \
-+ $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+ echo "installing $(srcdir)/$$cat as" \
-+ "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+ else \
-+ true; \
-+ fi; \
-+ fi; \
-+ done
-+ if test "$(PACKAGE)" = "gettext"; then \
-+ if test -r $(MKINSTALLDIRS); then \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-+ else \
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-+ fi; \
-+ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-+ else \
-+ : ; \
-+ fi
-+
-+# Define this as empty until I found a useful application.
-+installcheck:
-+
-+uninstall:
-+ catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+ done
-+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
-+
-+check: all
-+
-+cat-id-tbl.o: ../intl/libgettext.h
-+
-+html dvi pdf ps info tags TAGS ID:
-+
-+mostlyclean:
-+ rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-+ rm -fr *.o
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+ rm -f Makefile Makefile.in *.mo *.msg *.cat *.cat.m
-+ rm -f SRC-POTFILES BLD-POTFILES
-+
-+maintainer-clean: distclean
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+ rm -f $(GMOFILES) SRC-POTFILES.in BLD-POTFILES.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: update-po $(DISTFILES)
-+ dists="$(DISTFILES)"; \
-+ for file in $$dists; do \
-+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-+ || cp -p $(srcdir)/$$file $(distdir); \
-+ done
-+
-+update-po: Makefile
-+ $(MAKE) $(PACKAGE).pot
-+ PATH=`pwd`/../src:$$PATH; \
-+ cd $(srcdir); \
-+ catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-+ mv $$lang.po $$lang.old.po; \
-+ echo "$$lang:"; \
-+ if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-+ rm -f $$lang.old.po; \
-+ else \
-+ echo "msgmerge for $$cat failed!"; \
-+ rm -f $$lang.po; \
-+ mv $$lang.old.po $$lang.po; \
-+ fi; \
-+ done
-+
-+SRC-POTFILES: SRC-POTFILES.in
-+ ( if test 'x$(srcdir)' != 'x.'; then \
-+ posrcprefix='$(top_srcdir)/'; \
-+ else \
-+ posrcprefix="../"; \
-+ fi; \
-+ rm -f $@-t $@ \
-+ && (sed -e '/^#/d' \
-+ -e '/^[ ]*$$/d' \
-+ -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-+ | sed -e '$$s/\\$$//') > $@-t \
-+ && chmod a-w $@-t \
-+ && mv $@-t $@ )
-+
-+BLD-POTFILES: BLD-POTFILES.in
-+ ( rm -f $@-t $@ \
-+ && (sed -e '/^#/d' \
-+ -e '/^[ ]*$$/d' \
-+ -e "s@.*@ ../& \\\\@" < $(srcdir)/$@.in \
-+ | sed -e '$$s/\\$$//') > $@-t \
-+ && chmod a-w $@-t \
-+ && mv $@-t $@ )
-+
-+SRC-POTFILES.in: # ../Makefile
-+ cd .. && $(MAKE) po/SRC-POTFILES.in
-+
-+BLD-POTFILES.in: # ../Makefile
-+ cd .. && $(MAKE) po/BLD-POTFILES.in
-+
-+# Note - The presence of SRC-POTFILES and BLD-POTFILES as dependencies
-+# here breaks the implementation of the 'distclean' rule for maintainers.
-+# This is because if 'make distclean' is run in the BFD directory, the
-+# Makefile there will be deleted before 'distclean' is made here, and so
-+# the dependency SRC-POTFILES -> SRC-POTFILES.in -> ../Makefile cannot
-+# be satisfied.
-+#
-+# The SRC-POTFILES and BLD-POTFILES dependencies cannot be removed,
-+# however since it is necessary that these files be built during
-+# *configure* time, so that configure can insert them into the
-+# po/Makefile that it is creating, so that the Makefile will have
-+# the correct dependencies.
-+Makefile: Make-in ../config.status SRC-POTFILES BLD-POTFILES
-+ cd .. \
-+ && CONFIG_FILES=$(subdir)/Makefile.in:$(subdir)/Make-in \
-+ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- a/binutils/Makefile.in
-+++ b/binutils/Makefile.in
-@@ -1327,7 +1327,7 @@ readelf.o: readelf.c sysdep.h $(INCDIR)/
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h dwarf.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
-- $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h \
-+ $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/avr32.h\
- $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cris.h $(INCDIR)/elf/crx.h \
- $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
- $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/hppa.h \
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -384,7 +384,34 @@ ALL_EMULATIONS = \
- eavr3.o \
- eavr4.o \
- eavr5.o \
-- eavr6.o \
-+ eavr6.o \
-+ 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_uc3b164.o \
-+ eavr32elf_uc3b1128.o \
-+ eavr32elf_uc3b1256es.o \
-+ eavr32elf_uc3b1256.o \
-+ eavr32linux.o \
- ecoff_i860.o \
- ecoff_sparc.o \
- eelf32_spu.o \
-@@ -1448,6 +1475,114 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
- $(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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
-+ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+ $(srcdir)/scripttempl/elf_xip.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/elf_xip.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/elf_xip.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/elf_xip.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} avr32elf_uc3b1256es "$(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)"
-@@ -2679,7 +2814,9 @@ install-exec-local: ld-new$(EXEEXT)
- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
- 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 ; \
---- /dev/null
-+++ b/libiberty/required-list
-@@ -0,0 +1 @@
-+./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o ./alloca.o ./argv.o ./choose-temp.o ./concat.o ./cp-demint.o ./dyn-string.o ./fdmatch.o ./fibheap.o ./filename_cmp.o ./floatformat.o ./fnmatch.o ./fopen_unlocked.o ./getopt.o ./getopt1.o ./getpwd.o ./getruntime.o ./hashtab.o ./hex.o ./lbasename.o ./lrealpath.o ./make-relative-prefix.o ./make-temp-file.o ./objalloc.o ./obstack.o ./partition.o ./pexecute.o ./physmem.o ./pex-common.o ./pex-one.o ./pex-unix.o ./safe-ctype.o ./sort.o ./spaces.o ./splay-tree.o ./strerror.o ./strsignal.o ./unlink-if-ordinary.o ./xatexit.o ./xexit.o ./xmalloc.o ./xmemdup.o ./xstrdup.o ./xstrerror.o ./xstrndup.o
---- a/opcodes/configure
-+++ b/opcodes/configure
-@@ -11418,6 +11418,7 @@ if test x${all_targets} = xfalse ; then
- bfd_arc_arch) ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
- bfd_arm_arch) ta="$ta arm-dis.lo" ;;
- 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" ;;
-@@ -11476,7 +11477,7 @@ if test x${all_targets} = xfalse ; then
- 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" ;;
---- a/opcodes/Makefile.in
-+++ b/opcodes/Makefile.in
-@@ -257,6 +257,7 @@ LIBIBERTY = ../libiberty/libiberty.a
- # Header files.
- HFILES = \
- cgen-ops.h cgen-types.h \
-+ avr32-asm.h avr32-opc.h \
- fr30-desc.h fr30-opc.h \
- frv-desc.h frv-opc.h \
- h8500-opc.h \
-@@ -291,6 +292,9 @@ CFILES = \
- arc-ext.c \
- arm-dis.c \
- avr-dis.c \
-+ avr32-asm.c \
-+ avr32-dis.c \
-+ avr32-opc.c \
- bfin-dis.c \
- cgen-asm.c \
- cgen-bitset.c \
-@@ -445,6 +449,9 @@ ALL_MACHINES = \
- arc-ext.lo \
- arm-dis.lo \
- avr-dis.lo \
-+ avr32-asm.lo \
-+ avr32-dis.lo \
-+ avr32-opc.lo \
- bfin-dis.lo \
- cgen-asm.lo \
- cgen-bitset.lo \
-@@ -1225,6 +1232,15 @@ avr-dis.lo: avr-dis.c sysdep.h config.h
- $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- opintl.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
- $(INCDIR)/opcode/avr.h
-+avr32-asm.lo: avr32-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(BFD_H) $(INCDIR)/symcat.h avr32-opc.h opintl.h \
-+ $(INCDIR)/xregex.h $(INCDIR)/xregex2.h \
-+ $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-+avr32-dis.lo: avr32-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
-+ avr32-opc.h opintl.h
-+avr32-opc.lo: avr32-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-+ $(BFD_H) $(INCDIR)/symcat.h avr32-opc.h $(INCDIR)/libiberty.h
- bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
- $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
- cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
diff --git a/patches/binutils/2.25.1/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch b/patches/binutils/2.25.1/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch
deleted file mode 100644
index 32fc1a4..0000000
--- a/patches/binutils/2.25.1/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 55e9a09c2249f3d5bbc09d718679365604436aac Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sat, 13 Jun 2015 00:53:25 -0300
-Subject: [PATCH] AVR only; support -C for AVR memory usage
-
-Source: http://git.makehackvoid.com/cgi-bin/gitweb.cgi?p=mhvavrtools.git;a=blob_plain;f=mhvavrtools/patches/binutils-001-avr-size.patch;h=e80d28eae46217551d996a2253256c97d10aa4b5;hb=refs/heads/master
-
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
----
- binutils/size.c | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 394 insertions(+), 20 deletions(-)
-
-diff --git a/binutils/size.c b/binutils/size.c
-index 0937de5..486ddde 100644
---- a/binutils/size.c
-+++ b/binutils/size.c
-@@ -36,10 +36,31 @@
- #include "getopt.h"
- #include "bucomm.h"
-
--#ifndef BSD_DEFAULT
--#define BSD_DEFAULT 1
-+typedef enum
-+{
-+ format_sysv = 0,
-+ format_bsd = 1,
-+ format_avr = 2,
-+} format_type_t;
-+
-+
-+/* Set the default format. */
-+#define FORMAT_DEFAULT_SYSV 0
-+#define FORMAT_DEFAULT_BSD 1
-+#define FORMAT_DEFAULT_AVR 0
-+
-+#if FORMAT_DEFAULT_SYSV
-+ #define FORMAT_DEFAULT format_sysv
-+ #define FORMAT_NAME "sysv"
-+#elif FORMAT_DEFAULT_BSD
-+ #define FORMAT_DEFAULT format_bsd
-+ #define FORMAT_NAME "berkeley"
-+#elif FORMAT_DEFAULT_AVR
-+ #define FORMAT_DEFAULT format_avr
-+ #define FORMAT_NAME "avr"
- #endif
-
-+
- /* Program options. */
-
- static enum
-@@ -48,9 +69,8 @@ static enum
- }
- radix = decimal;
-
--/* 0 means use AT&T-style output. */
--static int berkeley_format = BSD_DEFAULT;
-
-+format_type_t format = FORMAT_DEFAULT;
- static int show_version = 0;
- static int show_help = 0;
- static int show_totals = 0;
-@@ -64,6 +84,246 @@ static bfd_size_type total_textsize;
- /* Program exit status. */
- static int return_code = 0;
-
-+
-+/* AVR Size specific stuff */
-+
-+#define AVR64 64UL
-+#define AVR128 128UL
-+#define AVR256 256UL
-+#define AVR512 512UL
-+#define AVR1K 1024UL
-+#define AVR2K 2048UL
-+#define AVR4K 4096UL
-+#define AVR8K 8192UL
-+#define AVR16K 16384UL
-+#define AVR20K 20480UL
-+#define AVR24K 24576UL
-+#define AVR32K 32768UL
-+#define AVR36K 36864UL
-+#define AVR40K 40960UL
-+#define AVR64K 65536UL
-+#define AVR68K 69632UL
-+#define AVR128K 131072UL
-+#define AVR136K 139264UL
-+#define AVR200K 204800UL
-+#define AVR256K 262144UL
-+#define AVR264K 270336UL
-+
-+typedef struct
-+{
-+ char *name;
-+ long flash;
-+ long ram;
-+ long eeprom;
-+} avr_device_t;
-+
-+avr_device_t avr[] =
-+{
-+ {"atxmega256a3", AVR264K, AVR16K, AVR4K},
-+ {"atxmega256a3b", AVR264K, AVR16K, AVR4K},
-+ {"atxmega256d3", AVR264K, AVR16K, AVR4K},
-+
-+ {"atmega2560", AVR256K, AVR8K, AVR4K},
-+ {"atmega2561", AVR256K, AVR8K, AVR4K},
-+
-+ {"atxmega192a3", AVR200K, AVR16K, AVR2K},
-+ {"atxmega192d3", AVR200K, AVR16K, AVR2K},
-+
-+ {"atxmega128a1", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128a1u", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128a3", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128d3", AVR136K, AVR8K, AVR2K},
-+
-+ {"at43usb320", AVR128K, 608UL, 0UL},
-+ {"at90can128", AVR128K, AVR4K, AVR4K},
-+ {"at90usb1286", AVR128K, AVR8K, AVR4K},
-+ {"at90usb1287", AVR128K, AVR8K, AVR4K},
-+ {"atmega128", AVR128K, AVR4K, AVR4K},
-+ {"atmega1280", AVR128K, AVR8K, AVR4K},
-+ {"atmega1281", AVR128K, AVR8K, AVR4K},
-+ {"atmega1284p", AVR128K, AVR16K, AVR4K},
-+ {"atmega128rfa1", AVR128K, AVR16K, AVR4K},
-+ {"atmega103", AVR128K, 4000UL, AVR4K},
-+
-+ {"atxmega64a1", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64a1u", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64a3", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64d3", AVR68K, AVR4K, AVR2K},
-+
-+ {"at90can64", AVR64K, AVR4K, AVR2K},
-+ {"at90scr100", AVR64K, AVR4K, AVR2K},
-+ {"at90usb646", AVR64K, AVR4K, AVR2K},
-+ {"at90usb647", AVR64K, AVR4K, AVR2K},
-+ {"atmega64", AVR64K, AVR4K, AVR2K},
-+ {"atmega640", AVR64K, AVR8K, AVR4K},
-+ {"atmega644", AVR64K, AVR4K, AVR2K},
-+ {"atmega644a", AVR64K, AVR4K, AVR2K},
-+ {"atmega644p", AVR64K, AVR4K, AVR2K},
-+ {"atmega644pa", AVR64K, AVR4K, AVR2K},
-+ {"atmega645", AVR64K, AVR4K, AVR2K},
-+ {"atmega645a", AVR64K, AVR4K, AVR2K},
-+ {"atmega645p", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450a", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450p", AVR64K, AVR4K, AVR2K},
-+ {"atmega649", AVR64K, AVR4K, AVR2K},
-+ {"atmega649a", AVR64K, AVR4K, AVR2K},
-+ {"atmega649p", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490a", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490p", AVR64K, AVR4K, AVR2K},
-+ {"atmega64c1", AVR64K, AVR4K, AVR2K},
-+ {"atmega64hve", AVR64K, AVR4K, AVR1K},
-+ {"atmega64m1", AVR64K, AVR4K, AVR2K},
-+ {"m3000", AVR64K, AVR4K, 0UL},
-+
-+ {"atmega406", AVR40K, AVR2K, AVR512},
-+
-+ {"atxmega32a4", AVR36K, AVR4K, AVR1K},
-+ {"atxmega32d4", AVR36K, AVR4K, AVR1K},
-+
-+ {"at90can32", AVR32K, AVR2K, AVR1K},
-+ {"at94k", AVR32K, AVR4K, 0UL},
-+ {"atmega32", AVR32K, AVR2K, AVR1K},
-+ {"atmega323", AVR32K, AVR2K, AVR1K},
-+ {"atmega324a", AVR32K, AVR2K, AVR1K},
-+ {"atmega324p", AVR32K, AVR2K, AVR1K},
-+ {"atmega324pa", AVR32K, AVR2K, AVR1K},
-+ {"atmega325", AVR32K, AVR2K, AVR1K},
-+ {"atmega325a", AVR32K, AVR2K, AVR1K},
-+ {"atmega325p", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250a", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250p", AVR32K, AVR2K, AVR1K},
-+ {"atmega328", AVR32K, AVR2K, AVR1K},
-+ {"atmega328p", AVR32K, AVR2K, AVR1K},
-+ {"atmega329", AVR32K, AVR2K, AVR1K},
-+ {"atmega329a", AVR32K, AVR2K, AVR1K},
-+ {"atmega329p", AVR32K, AVR2K, AVR1K},
-+ {"atmega329pa", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290a", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290p", AVR32K, AVR2K, AVR1K},
-+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
-+ {"atmega32c1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
-+ {"atmega32m1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32u2", AVR32K, AVR1K, AVR1K},
-+ {"atmega32u4", AVR32K, 2560UL, AVR1K},
-+ {"atmega32u6", AVR32K, 2560UL, AVR1K},
-+
-+ {"at43usb355", AVR24K, 1120UL, 0UL},
-+
-+ {"atxmega16a4", AVR20K, AVR2K, AVR1K},
-+ {"atxmega16d4", AVR20K, AVR2K, AVR1K},
-+
-+ {"at76c711", AVR16K, AVR2K, 0UL},
-+ {"at90pwm216", AVR16K, AVR1K, AVR512},
-+ {"at90pwm316", AVR16K, AVR1K, AVR512},
-+ {"at90usb162", AVR16K, AVR512, AVR512},
-+ {"atmega16", AVR16K, AVR1K, AVR512},
-+ {"atmega16a", AVR16K, AVR1K, AVR512},
-+ {"atmega161", AVR16K, AVR1K, AVR512},
-+ {"atmega162", AVR16K, AVR1K, AVR512},
-+ {"atmega163", AVR16K, AVR1K, AVR512},
-+ {"atmega164", AVR16K, AVR1K, AVR512},
-+ {"atmega164a", AVR16K, AVR1K, AVR512},
-+ {"atmega164p", AVR16K, AVR1K, AVR512},
-+ {"atmega165a", AVR16K, AVR1K, AVR512},
-+ {"atmega165", AVR16K, AVR1K, AVR512},
-+ {"atmega165p", AVR16K, AVR1K, AVR512},
-+ {"atmega168", AVR16K, AVR1K, AVR512},
-+ {"atmega168a", AVR16K, AVR1K, AVR512},
-+ {"atmega168p", AVR16K, AVR1K, AVR512},
-+ {"atmega169", AVR16K, AVR1K, AVR512},
-+ {"atmega169a", AVR16K, AVR1K, AVR512},
-+ {"atmega169p", AVR16K, AVR1K, AVR512},
-+ {"atmega169pa", AVR16K, AVR1K, AVR512},
-+ {"atmega16hva", AVR16K, 768UL, AVR256},
-+ {"atmega16hva2", AVR16K, AVR1K, AVR256},
-+ {"atmega16hvb", AVR16K, AVR1K, AVR512},
-+ {"atmega16m1", AVR16K, AVR1K, AVR512},
-+ {"atmega16u2", AVR16K, AVR512, AVR512},
-+ {"atmega16u4", AVR16K, 1280UL, AVR512},
-+ {"attiny167", AVR16K, AVR512, AVR512},
-+
-+ {"at90c8534", AVR8K, 352UL, AVR512},
-+ {"at90pwm1", AVR8K, AVR512, AVR512},
-+ {"at90pwm2", AVR8K, AVR512, AVR512},
-+ {"at90pwm2b", AVR8K, AVR512, AVR512},
-+ {"at90pwm3", AVR8K, AVR512, AVR512},
-+ {"at90pwm3b", AVR8K, AVR512, AVR512},
-+ {"at90pwm81", AVR8K, AVR256, AVR512},
-+ {"at90s8515", AVR8K, AVR512, AVR512},
-+ {"at90s8535", AVR8K, AVR512, AVR512},
-+ {"at90usb82", AVR8K, AVR512, AVR512},
-+ {"ata6289", AVR8K, AVR512, 320UL},
-+ {"atmega8", AVR8K, AVR1K, AVR512},
-+ {"atmega8515", AVR8K, AVR512, AVR512},
-+ {"atmega8535", AVR8K, AVR512, AVR512},
-+ {"atmega88", AVR8K, AVR1K, AVR512},
-+ {"atmega88a", AVR8K, AVR1K, AVR512},
-+ {"atmega88p", AVR8K, AVR1K, AVR512},
-+ {"atmega88pa", AVR8K, AVR1K, AVR512},
-+ {"atmega8hva", AVR8K, 768UL, AVR256},
-+ {"atmega8u2", AVR8K, AVR512, AVR512},
-+ {"attiny84", AVR8K, AVR512, AVR512},
-+ {"attiny84a", AVR8K, AVR512, AVR512},
-+ {"attiny85", AVR8K, AVR512, AVR512},
-+ {"attiny861", AVR8K, AVR512, AVR512},
-+ {"attiny861a", AVR8K, AVR512, AVR512},
-+ {"attiny87", AVR8K, AVR512, AVR512},
-+ {"attiny88", AVR8K, AVR512, AVR64},
-+
-+ {"at90s4414", AVR4K, 352UL, AVR256},
-+ {"at90s4433", AVR4K, AVR128, AVR256},
-+ {"at90s4434", AVR4K, 352UL, AVR256},
-+ {"atmega48", AVR4K, AVR512, AVR256},
-+ {"atmega48a", AVR4K, AVR512, AVR256},
-+ {"atmega48p", AVR4K, AVR512, AVR256},
-+ {"attiny4313", AVR4K, AVR256, AVR256},
-+ {"attiny43u", AVR4K, AVR256, AVR64},
-+ {"attiny44", AVR4K, AVR256, AVR256},
-+ {"attiny44a", AVR4K, AVR256, AVR256},
-+ {"attiny45", AVR4K, AVR256, AVR256},
-+ {"attiny461", AVR4K, AVR256, AVR256},
-+ {"attiny461a", AVR4K, AVR256, AVR256},
-+ {"attiny48", AVR4K, AVR256, AVR64},
-+
-+ {"at86rf401", AVR2K, 224UL, AVR128},
-+ {"at90s2313", AVR2K, AVR128, AVR128},
-+ {"at90s2323", AVR2K, AVR128, AVR128},
-+ {"at90s2333", AVR2K, 224UL, AVR128},
-+ {"at90s2343", AVR2K, AVR128, AVR128},
-+ {"attiny20", AVR2K, AVR128, 0UL},
-+ {"attiny22", AVR2K, 224UL, AVR128},
-+ {"attiny2313", AVR2K, AVR128, AVR128},
-+ {"attiny2313a", AVR2K, AVR128, AVR128},
-+ {"attiny24", AVR2K, AVR128, AVR128},
-+ {"attiny24a", AVR2K, AVR128, AVR128},
-+ {"attiny25", AVR2K, AVR128, AVR128},
-+ {"attiny26", AVR2K, AVR128, AVR128},
-+ {"attiny261", AVR2K, AVR128, AVR128},
-+ {"attiny261a", AVR2K, AVR128, AVR128},
-+ {"attiny28", AVR2K, 0UL, 0UL},
-+ {"attiny40", AVR2K, AVR256, 0UL},
-+
-+ {"at90s1200", AVR1K, 0UL, AVR64},
-+ {"attiny9", AVR1K, 32UL, 0UL},
-+ {"attiny10", AVR1K, 32UL, 0UL},
-+ {"attiny11", AVR1K, 0UL, AVR64},
-+ {"attiny12", AVR1K, 0UL, AVR64},
-+ {"attiny13", AVR1K, AVR64, AVR64},
-+ {"attiny13a", AVR1K, AVR64, AVR64},
-+ {"attiny15", AVR1K, 0UL, AVR64},
-+
-+ {"attiny4", AVR512, 32UL, 0UL},
-+ {"attiny5", AVR512, 32UL, 0UL},
-+};
-+
-+static char *avrmcu = NULL;
-+
-+
- static char *target = NULL;
-
- /* Forward declarations. */
-@@ -79,7 +339,8 @@ usage (FILE *stream, int status)
- fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
- fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
- fprintf (stream, _(" The options are:\n\
-- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\
-+ -A|-B|-C --format={sysv|berkeley|avr} Select output style (default is %s)\n\
-+ --mcu=<avrmcu> MCU name for AVR format only\n\
- -o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
- -t --totals Display the total sizes (Berkeley only)\n\
- --common Display total size for *COM* syms\n\
-@@ -88,11 +349,7 @@ usage (FILE *stream, int status)
- -h --help Display this information\n\
- -v --version Display the program's version\n\
- \n"),
--#if BSD_DEFAULT
-- "berkeley"
--#else
-- "sysv"
--#endif
-+FORMAT_NAME
- );
- list_supported_targets (program_name, stream);
- if (REPORT_BUGS_TO[0] && status == 0)
-@@ -103,6 +360,7 @@ usage (FILE *stream, int status)
- #define OPTION_FORMAT (200)
- #define OPTION_RADIX (OPTION_FORMAT + 1)
- #define OPTION_TARGET (OPTION_RADIX + 1)
-+#define OPTION_MCU (OPTION_TARGET + 1)
-
- static struct option long_options[] =
- {
-@@ -110,6 +368,7 @@ static struct option long_options[] =
- {"format", required_argument, 0, OPTION_FORMAT},
- {"radix", required_argument, 0, OPTION_RADIX},
- {"target", required_argument, 0, OPTION_TARGET},
-+ {"mcu", required_argument, 0, 203},
- {"totals", no_argument, &show_totals, 1},
- {"version", no_argument, &show_version, 1},
- {"help", no_argument, &show_help, 1},
-@@ -141,7 +400,7 @@ main (int argc, char **argv)
- bfd_init ();
- set_default_bfd_target ();
-
-- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
-+ while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options,
- (int *) 0)) != EOF)
- switch (c)
- {
-@@ -150,11 +409,15 @@ main (int argc, char **argv)
- {
- case 'B':
- case 'b':
-- berkeley_format = 1;
-+ format = format_bsd;
- break;
- case 'S':
- case 's':
-- berkeley_format = 0;
-+ format = format_sysv;
-+ break;
-+ case 'A':
-+ case 'a':
-+ format = format_avr;
- break;
- default:
- non_fatal (_("invalid argument to --format: %s"), optarg);
-@@ -162,6 +425,10 @@ main (int argc, char **argv)
- }
- break;
-
-+ case OPTION_MCU:
-+ avrmcu = optarg;
-+ break;
-+
- case OPTION_TARGET:
- target = optarg;
- break;
-@@ -190,11 +457,14 @@ main (int argc, char **argv)
- break;
-
- case 'A':
-- berkeley_format = 0;
-+ format = format_sysv;
- break;
- case 'B':
-- berkeley_format = 1;
-+ format = format_bsd;
- break;
-+ case 'C':
-+ format = format_avr;
-+ break;
- case 'v':
- case 'V':
- show_version = 1;
-@@ -240,7 +510,7 @@ main (int argc, char **argv)
- for (; optind < argc;)
- display_file (argv[optind++]);
-
-- if (show_totals && berkeley_format)
-+ if (show_totals && format == format_bsd)
- {
- bfd_size_type total = total_textsize + total_datasize + total_bsssize;
-
-@@ -599,13 +869,117 @@ print_sysv_format (bfd *file)
- printf ("\n\n");
- }
-
-+
-+static avr_device_t *
-+avr_find_device (void)
-+{
-+ unsigned int i;
-+ if (avrmcu != NULL)
-+ {
-+ for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++)
-+ {
-+ if (strcmp(avr[i].name, avrmcu) == 0)
-+ {
-+ /* Match found */
-+ return (&avr[i]);
-+ }
-+ }
-+ }
-+ return (NULL);
-+}
-+
-+
-+
-+static void
-+print_avr_format (bfd *file)
-+{
-+ char *avr_name = "Unknown";
-+ int flashmax = 0;
-+ int rammax = 0;
-+ int eeprommax = 0;
-+ asection *section;
-+ bfd_size_type my_datasize = 0;
-+ bfd_size_type my_textsize = 0;
-+ bfd_size_type my_bsssize = 0;
-+ bfd_size_type bootloadersize = 0;
-+ bfd_size_type noinitsize = 0;
-+ bfd_size_type eepromsize = 0;
-+
-+ avr_device_t *avrdevice = avr_find_device();
-+ if (avrdevice != NULL)
-+ {
-+ avr_name = avrdevice->name;
-+ flashmax = avrdevice->flash;
-+ rammax = avrdevice->ram;
-+ eeprommax = avrdevice->eeprom;
-+ }
-+
-+ if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+ my_datasize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+ my_textsize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+ my_bsssize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
-+ bootloadersize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
-+ noinitsize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
-+ eepromsize = bfd_section_size (file, section);
-+
-+ bfd_size_type text = my_textsize + my_datasize + bootloadersize;
-+ bfd_size_type data = my_datasize + my_bsssize + noinitsize;
-+ bfd_size_type eeprom = eepromsize;
-+
-+ printf ("AVR Memory Usage\n"
-+ "----------------\n"
-+ "Device: %s\n\n", avr_name);
-+
-+ /* Text size */
-+ printf ("Program:%8ld bytes", text);
-+ if (flashmax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100);
-+ }
-+ printf ("\n(.text + .data + .bootloader)\n\n");
-+
-+ /* Data size */
-+ printf ("Data: %8ld bytes", data);
-+ if (rammax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)data / rammax) * 100);
-+ }
-+ printf ("\n(.data + .bss + .noinit)\n\n");
-+
-+ /* EEPROM size */
-+ if (eeprom > 0)
-+ {
-+ printf ("EEPROM: %8ld bytes", eeprom);
-+ if (eeprommax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100);
-+ }
-+ printf ("\n(.eeprom)\n\n");
-+ }
-+}
-+
-+
- static void
- print_sizes (bfd *file)
- {
- if (show_common)
- calculate_common_size (file);
-- if (berkeley_format)
-- print_berkeley_format (file);
-- else
-- print_sysv_format (file);
-+ switch (format)
-+ {
-+ case format_sysv:
-+ print_sysv_format (file);
-+ break;
-+ case format_bsd:
-+ print_berkeley_format (file);
-+ break;
-+ case format_avr:
-+ default:
-+ print_avr_format (file);
-+ break;
-+ }
- }
---
-2.4.1
-
diff --git a/patches/binutils/2.25/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch b/patches/binutils/2.25/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch
deleted file mode 100644
index 32fc1a4..0000000
--- a/patches/binutils/2.25/avr/0001-AVR-only-support-C-for-AVR-memory-usage.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 55e9a09c2249f3d5bbc09d718679365604436aac Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sat, 13 Jun 2015 00:53:25 -0300
-Subject: [PATCH] AVR only; support -C for AVR memory usage
-
-Source: http://git.makehackvoid.com/cgi-bin/gitweb.cgi?p=mhvavrtools.git;a=blob_plain;f=mhvavrtools/patches/binutils-001-avr-size.patch;h=e80d28eae46217551d996a2253256c97d10aa4b5;hb=refs/heads/master
-
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
----
- binutils/size.c | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 394 insertions(+), 20 deletions(-)
-
-diff --git a/binutils/size.c b/binutils/size.c
-index 0937de5..486ddde 100644
---- a/binutils/size.c
-+++ b/binutils/size.c
-@@ -36,10 +36,31 @@
- #include "getopt.h"
- #include "bucomm.h"
-
--#ifndef BSD_DEFAULT
--#define BSD_DEFAULT 1
-+typedef enum
-+{
-+ format_sysv = 0,
-+ format_bsd = 1,
-+ format_avr = 2,
-+} format_type_t;
-+
-+
-+/* Set the default format. */
-+#define FORMAT_DEFAULT_SYSV 0
-+#define FORMAT_DEFAULT_BSD 1
-+#define FORMAT_DEFAULT_AVR 0
-+
-+#if FORMAT_DEFAULT_SYSV
-+ #define FORMAT_DEFAULT format_sysv
-+ #define FORMAT_NAME "sysv"
-+#elif FORMAT_DEFAULT_BSD
-+ #define FORMAT_DEFAULT format_bsd
-+ #define FORMAT_NAME "berkeley"
-+#elif FORMAT_DEFAULT_AVR
-+ #define FORMAT_DEFAULT format_avr
-+ #define FORMAT_NAME "avr"
- #endif
-
-+
- /* Program options. */
-
- static enum
-@@ -48,9 +69,8 @@ static enum
- }
- radix = decimal;
-
--/* 0 means use AT&T-style output. */
--static int berkeley_format = BSD_DEFAULT;
-
-+format_type_t format = FORMAT_DEFAULT;
- static int show_version = 0;
- static int show_help = 0;
- static int show_totals = 0;
-@@ -64,6 +84,246 @@ static bfd_size_type total_textsize;
- /* Program exit status. */
- static int return_code = 0;
-
-+
-+/* AVR Size specific stuff */
-+
-+#define AVR64 64UL
-+#define AVR128 128UL
-+#define AVR256 256UL
-+#define AVR512 512UL
-+#define AVR1K 1024UL
-+#define AVR2K 2048UL
-+#define AVR4K 4096UL
-+#define AVR8K 8192UL
-+#define AVR16K 16384UL
-+#define AVR20K 20480UL
-+#define AVR24K 24576UL
-+#define AVR32K 32768UL
-+#define AVR36K 36864UL
-+#define AVR40K 40960UL
-+#define AVR64K 65536UL
-+#define AVR68K 69632UL
-+#define AVR128K 131072UL
-+#define AVR136K 139264UL
-+#define AVR200K 204800UL
-+#define AVR256K 262144UL
-+#define AVR264K 270336UL
-+
-+typedef struct
-+{
-+ char *name;
-+ long flash;
-+ long ram;
-+ long eeprom;
-+} avr_device_t;
-+
-+avr_device_t avr[] =
-+{
-+ {"atxmega256a3", AVR264K, AVR16K, AVR4K},
-+ {"atxmega256a3b", AVR264K, AVR16K, AVR4K},
-+ {"atxmega256d3", AVR264K, AVR16K, AVR4K},
-+
-+ {"atmega2560", AVR256K, AVR8K, AVR4K},
-+ {"atmega2561", AVR256K, AVR8K, AVR4K},
-+
-+ {"atxmega192a3", AVR200K, AVR16K, AVR2K},
-+ {"atxmega192d3", AVR200K, AVR16K, AVR2K},
-+
-+ {"atxmega128a1", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128a1u", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128a3", AVR136K, AVR8K, AVR2K},
-+ {"atxmega128d3", AVR136K, AVR8K, AVR2K},
-+
-+ {"at43usb320", AVR128K, 608UL, 0UL},
-+ {"at90can128", AVR128K, AVR4K, AVR4K},
-+ {"at90usb1286", AVR128K, AVR8K, AVR4K},
-+ {"at90usb1287", AVR128K, AVR8K, AVR4K},
-+ {"atmega128", AVR128K, AVR4K, AVR4K},
-+ {"atmega1280", AVR128K, AVR8K, AVR4K},
-+ {"atmega1281", AVR128K, AVR8K, AVR4K},
-+ {"atmega1284p", AVR128K, AVR16K, AVR4K},
-+ {"atmega128rfa1", AVR128K, AVR16K, AVR4K},
-+ {"atmega103", AVR128K, 4000UL, AVR4K},
-+
-+ {"atxmega64a1", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64a1u", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64a3", AVR68K, AVR4K, AVR2K},
-+ {"atxmega64d3", AVR68K, AVR4K, AVR2K},
-+
-+ {"at90can64", AVR64K, AVR4K, AVR2K},
-+ {"at90scr100", AVR64K, AVR4K, AVR2K},
-+ {"at90usb646", AVR64K, AVR4K, AVR2K},
-+ {"at90usb647", AVR64K, AVR4K, AVR2K},
-+ {"atmega64", AVR64K, AVR4K, AVR2K},
-+ {"atmega640", AVR64K, AVR8K, AVR4K},
-+ {"atmega644", AVR64K, AVR4K, AVR2K},
-+ {"atmega644a", AVR64K, AVR4K, AVR2K},
-+ {"atmega644p", AVR64K, AVR4K, AVR2K},
-+ {"atmega644pa", AVR64K, AVR4K, AVR2K},
-+ {"atmega645", AVR64K, AVR4K, AVR2K},
-+ {"atmega645a", AVR64K, AVR4K, AVR2K},
-+ {"atmega645p", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450a", AVR64K, AVR4K, AVR2K},
-+ {"atmega6450p", AVR64K, AVR4K, AVR2K},
-+ {"atmega649", AVR64K, AVR4K, AVR2K},
-+ {"atmega649a", AVR64K, AVR4K, AVR2K},
-+ {"atmega649p", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490a", AVR64K, AVR4K, AVR2K},
-+ {"atmega6490p", AVR64K, AVR4K, AVR2K},
-+ {"atmega64c1", AVR64K, AVR4K, AVR2K},
-+ {"atmega64hve", AVR64K, AVR4K, AVR1K},
-+ {"atmega64m1", AVR64K, AVR4K, AVR2K},
-+ {"m3000", AVR64K, AVR4K, 0UL},
-+
-+ {"atmega406", AVR40K, AVR2K, AVR512},
-+
-+ {"atxmega32a4", AVR36K, AVR4K, AVR1K},
-+ {"atxmega32d4", AVR36K, AVR4K, AVR1K},
-+
-+ {"at90can32", AVR32K, AVR2K, AVR1K},
-+ {"at94k", AVR32K, AVR4K, 0UL},
-+ {"atmega32", AVR32K, AVR2K, AVR1K},
-+ {"atmega323", AVR32K, AVR2K, AVR1K},
-+ {"atmega324a", AVR32K, AVR2K, AVR1K},
-+ {"atmega324p", AVR32K, AVR2K, AVR1K},
-+ {"atmega324pa", AVR32K, AVR2K, AVR1K},
-+ {"atmega325", AVR32K, AVR2K, AVR1K},
-+ {"atmega325a", AVR32K, AVR2K, AVR1K},
-+ {"atmega325p", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250a", AVR32K, AVR2K, AVR1K},
-+ {"atmega3250p", AVR32K, AVR2K, AVR1K},
-+ {"atmega328", AVR32K, AVR2K, AVR1K},
-+ {"atmega328p", AVR32K, AVR2K, AVR1K},
-+ {"atmega329", AVR32K, AVR2K, AVR1K},
-+ {"atmega329a", AVR32K, AVR2K, AVR1K},
-+ {"atmega329p", AVR32K, AVR2K, AVR1K},
-+ {"atmega329pa", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290a", AVR32K, AVR2K, AVR1K},
-+ {"atmega3290p", AVR32K, AVR2K, AVR1K},
-+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
-+ {"atmega32c1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
-+ {"atmega32m1", AVR32K, AVR2K, AVR1K},
-+ {"atmega32u2", AVR32K, AVR1K, AVR1K},
-+ {"atmega32u4", AVR32K, 2560UL, AVR1K},
-+ {"atmega32u6", AVR32K, 2560UL, AVR1K},
-+
-+ {"at43usb355", AVR24K, 1120UL, 0UL},
-+
-+ {"atxmega16a4", AVR20K, AVR2K, AVR1K},
-+ {"atxmega16d4", AVR20K, AVR2K, AVR1K},
-+
-+ {"at76c711", AVR16K, AVR2K, 0UL},
-+ {"at90pwm216", AVR16K, AVR1K, AVR512},
-+ {"at90pwm316", AVR16K, AVR1K, AVR512},
-+ {"at90usb162", AVR16K, AVR512, AVR512},
-+ {"atmega16", AVR16K, AVR1K, AVR512},
-+ {"atmega16a", AVR16K, AVR1K, AVR512},
-+ {"atmega161", AVR16K, AVR1K, AVR512},
-+ {"atmega162", AVR16K, AVR1K, AVR512},
-+ {"atmega163", AVR16K, AVR1K, AVR512},
-+ {"atmega164", AVR16K, AVR1K, AVR512},
-+ {"atmega164a", AVR16K, AVR1K, AVR512},
-+ {"atmega164p", AVR16K, AVR1K, AVR512},
-+ {"atmega165a", AVR16K, AVR1K, AVR512},
-+ {"atmega165", AVR16K, AVR1K, AVR512},
-+ {"atmega165p", AVR16K, AVR1K, AVR512},
-+ {"atmega168", AVR16K, AVR1K, AVR512},
-+ {"atmega168a", AVR16K, AVR1K, AVR512},
-+ {"atmega168p", AVR16K, AVR1K, AVR512},
-+ {"atmega169", AVR16K, AVR1K, AVR512},
-+ {"atmega169a", AVR16K, AVR1K, AVR512},
-+ {"atmega169p", AVR16K, AVR1K, AVR512},
-+ {"atmega169pa", AVR16K, AVR1K, AVR512},
-+ {"atmega16hva", AVR16K, 768UL, AVR256},
-+ {"atmega16hva2", AVR16K, AVR1K, AVR256},
-+ {"atmega16hvb", AVR16K, AVR1K, AVR512},
-+ {"atmega16m1", AVR16K, AVR1K, AVR512},
-+ {"atmega16u2", AVR16K, AVR512, AVR512},
-+ {"atmega16u4", AVR16K, 1280UL, AVR512},
-+ {"attiny167", AVR16K, AVR512, AVR512},
-+
-+ {"at90c8534", AVR8K, 352UL, AVR512},
-+ {"at90pwm1", AVR8K, AVR512, AVR512},
-+ {"at90pwm2", AVR8K, AVR512, AVR512},
-+ {"at90pwm2b", AVR8K, AVR512, AVR512},
-+ {"at90pwm3", AVR8K, AVR512, AVR512},
-+ {"at90pwm3b", AVR8K, AVR512, AVR512},
-+ {"at90pwm81", AVR8K, AVR256, AVR512},
-+ {"at90s8515", AVR8K, AVR512, AVR512},
-+ {"at90s8535", AVR8K, AVR512, AVR512},
-+ {"at90usb82", AVR8K, AVR512, AVR512},
-+ {"ata6289", AVR8K, AVR512, 320UL},
-+ {"atmega8", AVR8K, AVR1K, AVR512},
-+ {"atmega8515", AVR8K, AVR512, AVR512},
-+ {"atmega8535", AVR8K, AVR512, AVR512},
-+ {"atmega88", AVR8K, AVR1K, AVR512},
-+ {"atmega88a", AVR8K, AVR1K, AVR512},
-+ {"atmega88p", AVR8K, AVR1K, AVR512},
-+ {"atmega88pa", AVR8K, AVR1K, AVR512},
-+ {"atmega8hva", AVR8K, 768UL, AVR256},
-+ {"atmega8u2", AVR8K, AVR512, AVR512},
-+ {"attiny84", AVR8K, AVR512, AVR512},
-+ {"attiny84a", AVR8K, AVR512, AVR512},
-+ {"attiny85", AVR8K, AVR512, AVR512},
-+ {"attiny861", AVR8K, AVR512, AVR512},
-+ {"attiny861a", AVR8K, AVR512, AVR512},
-+ {"attiny87", AVR8K, AVR512, AVR512},
-+ {"attiny88", AVR8K, AVR512, AVR64},
-+
-+ {"at90s4414", AVR4K, 352UL, AVR256},
-+ {"at90s4433", AVR4K, AVR128, AVR256},
-+ {"at90s4434", AVR4K, 352UL, AVR256},
-+ {"atmega48", AVR4K, AVR512, AVR256},
-+ {"atmega48a", AVR4K, AVR512, AVR256},
-+ {"atmega48p", AVR4K, AVR512, AVR256},
-+ {"attiny4313", AVR4K, AVR256, AVR256},
-+ {"attiny43u", AVR4K, AVR256, AVR64},
-+ {"attiny44", AVR4K, AVR256, AVR256},
-+ {"attiny44a", AVR4K, AVR256, AVR256},
-+ {"attiny45", AVR4K, AVR256, AVR256},
-+ {"attiny461", AVR4K, AVR256, AVR256},
-+ {"attiny461a", AVR4K, AVR256, AVR256},
-+ {"attiny48", AVR4K, AVR256, AVR64},
-+
-+ {"at86rf401", AVR2K, 224UL, AVR128},
-+ {"at90s2313", AVR2K, AVR128, AVR128},
-+ {"at90s2323", AVR2K, AVR128, AVR128},
-+ {"at90s2333", AVR2K, 224UL, AVR128},
-+ {"at90s2343", AVR2K, AVR128, AVR128},
-+ {"attiny20", AVR2K, AVR128, 0UL},
-+ {"attiny22", AVR2K, 224UL, AVR128},
-+ {"attiny2313", AVR2K, AVR128, AVR128},
-+ {"attiny2313a", AVR2K, AVR128, AVR128},
-+ {"attiny24", AVR2K, AVR128, AVR128},
-+ {"attiny24a", AVR2K, AVR128, AVR128},
-+ {"attiny25", AVR2K, AVR128, AVR128},
-+ {"attiny26", AVR2K, AVR128, AVR128},
-+ {"attiny261", AVR2K, AVR128, AVR128},
-+ {"attiny261a", AVR2K, AVR128, AVR128},
-+ {"attiny28", AVR2K, 0UL, 0UL},
-+ {"attiny40", AVR2K, AVR256, 0UL},
-+
-+ {"at90s1200", AVR1K, 0UL, AVR64},
-+ {"attiny9", AVR1K, 32UL, 0UL},
-+ {"attiny10", AVR1K, 32UL, 0UL},
-+ {"attiny11", AVR1K, 0UL, AVR64},
-+ {"attiny12", AVR1K, 0UL, AVR64},
-+ {"attiny13", AVR1K, AVR64, AVR64},
-+ {"attiny13a", AVR1K, AVR64, AVR64},
-+ {"attiny15", AVR1K, 0UL, AVR64},
-+
-+ {"attiny4", AVR512, 32UL, 0UL},
-+ {"attiny5", AVR512, 32UL, 0UL},
-+};
-+
-+static char *avrmcu = NULL;
-+
-+
- static char *target = NULL;
-
- /* Forward declarations. */
-@@ -79,7 +339,8 @@ usage (FILE *stream, int status)
- fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
- fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
- fprintf (stream, _(" The options are:\n\
-- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\
-+ -A|-B|-C --format={sysv|berkeley|avr} Select output style (default is %s)\n\
-+ --mcu=<avrmcu> MCU name for AVR format only\n\
- -o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
- -t --totals Display the total sizes (Berkeley only)\n\
- --common Display total size for *COM* syms\n\
-@@ -88,11 +349,7 @@ usage (FILE *stream, int status)
- -h --help Display this information\n\
- -v --version Display the program's version\n\
- \n"),
--#if BSD_DEFAULT
-- "berkeley"
--#else
-- "sysv"
--#endif
-+FORMAT_NAME
- );
- list_supported_targets (program_name, stream);
- if (REPORT_BUGS_TO[0] && status == 0)
-@@ -103,6 +360,7 @@ usage (FILE *stream, int status)
- #define OPTION_FORMAT (200)
- #define OPTION_RADIX (OPTION_FORMAT + 1)
- #define OPTION_TARGET (OPTION_RADIX + 1)
-+#define OPTION_MCU (OPTION_TARGET + 1)
-
- static struct option long_options[] =
- {
-@@ -110,6 +368,7 @@ static struct option long_options[] =
- {"format", required_argument, 0, OPTION_FORMAT},
- {"radix", required_argument, 0, OPTION_RADIX},
- {"target", required_argument, 0, OPTION_TARGET},
-+ {"mcu", required_argument, 0, 203},
- {"totals", no_argument, &show_totals, 1},
- {"version", no_argument, &show_version, 1},
- {"help", no_argument, &show_help, 1},
-@@ -141,7 +400,7 @@ main (int argc, char **argv)
- bfd_init ();
- set_default_bfd_target ();
-
-- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
-+ while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options,
- (int *) 0)) != EOF)
- switch (c)
- {
-@@ -150,11 +409,15 @@ main (int argc, char **argv)
- {
- case 'B':
- case 'b':
-- berkeley_format = 1;
-+ format = format_bsd;
- break;
- case 'S':
- case 's':
-- berkeley_format = 0;
-+ format = format_sysv;
-+ break;
-+ case 'A':
-+ case 'a':
-+ format = format_avr;
- break;
- default:
- non_fatal (_("invalid argument to --format: %s"), optarg);
-@@ -162,6 +425,10 @@ main (int argc, char **argv)
- }
- break;
-
-+ case OPTION_MCU:
-+ avrmcu = optarg;
-+ break;
-+
- case OPTION_TARGET:
- target = optarg;
- break;
-@@ -190,11 +457,14 @@ main (int argc, char **argv)
- break;
-
- case 'A':
-- berkeley_format = 0;
-+ format = format_sysv;
- break;
- case 'B':
-- berkeley_format = 1;
-+ format = format_bsd;
- break;
-+ case 'C':
-+ format = format_avr;
-+ break;
- case 'v':
- case 'V':
- show_version = 1;
-@@ -240,7 +510,7 @@ main (int argc, char **argv)
- for (; optind < argc;)
- display_file (argv[optind++]);
-
-- if (show_totals && berkeley_format)
-+ if (show_totals && format == format_bsd)
- {
- bfd_size_type total = total_textsize + total_datasize + total_bsssize;
-
-@@ -599,13 +869,117 @@ print_sysv_format (bfd *file)
- printf ("\n\n");
- }
-
-+
-+static avr_device_t *
-+avr_find_device (void)
-+{
-+ unsigned int i;
-+ if (avrmcu != NULL)
-+ {
-+ for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++)
-+ {
-+ if (strcmp(avr[i].name, avrmcu) == 0)
-+ {
-+ /* Match found */
-+ return (&avr[i]);
-+ }
-+ }
-+ }
-+ return (NULL);
-+}
-+
-+
-+
-+static void
-+print_avr_format (bfd *file)
-+{
-+ char *avr_name = "Unknown";
-+ int flashmax = 0;
-+ int rammax = 0;
-+ int eeprommax = 0;
-+ asection *section;
-+ bfd_size_type my_datasize = 0;
-+ bfd_size_type my_textsize = 0;
-+ bfd_size_type my_bsssize = 0;
-+ bfd_size_type bootloadersize = 0;
-+ bfd_size_type noinitsize = 0;
-+ bfd_size_type eepromsize = 0;
-+
-+ avr_device_t *avrdevice = avr_find_device();
-+ if (avrdevice != NULL)
-+ {
-+ avr_name = avrdevice->name;
-+ flashmax = avrdevice->flash;
-+ rammax = avrdevice->ram;
-+ eeprommax = avrdevice->eeprom;
-+ }
-+
-+ if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+ my_datasize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+ my_textsize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+ my_bsssize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
-+ bootloadersize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
-+ noinitsize = bfd_section_size (file, section);
-+ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
-+ eepromsize = bfd_section_size (file, section);
-+
-+ bfd_size_type text = my_textsize + my_datasize + bootloadersize;
-+ bfd_size_type data = my_datasize + my_bsssize + noinitsize;
-+ bfd_size_type eeprom = eepromsize;
-+
-+ printf ("AVR Memory Usage\n"
-+ "----------------\n"
-+ "Device: %s\n\n", avr_name);
-+
-+ /* Text size */
-+ printf ("Program:%8ld bytes", text);
-+ if (flashmax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100);
-+ }
-+ printf ("\n(.text + .data + .bootloader)\n\n");
-+
-+ /* Data size */
-+ printf ("Data: %8ld bytes", data);
-+ if (rammax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)data / rammax) * 100);
-+ }
-+ printf ("\n(.data + .bss + .noinit)\n\n");
-+
-+ /* EEPROM size */
-+ if (eeprom > 0)
-+ {
-+ printf ("EEPROM: %8ld bytes", eeprom);
-+ if (eeprommax > 0)
-+ {
-+ printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100);
-+ }
-+ printf ("\n(.eeprom)\n\n");
-+ }
-+}
-+
-+
- static void
- print_sizes (bfd *file)
- {
- if (show_common)
- calculate_common_size (file);
-- if (berkeley_format)
-- print_berkeley_format (file);
-- else
-- print_sysv_format (file);
-+ switch (format)
-+ {
-+ case format_sysv:
-+ print_sysv_format (file);
-+ break;
-+ case format_bsd:
-+ print_berkeley_format (file);
-+ break;
-+ case format_avr:
-+ default:
-+ print_avr_format (file);
-+ break;
-+ }
- }
---
-2.4.1
-
diff --git a/patches/gcc/3.4.6/100-uclibc-conf.patch b/patches/gcc/3.4.6/100-uclibc-conf.patch
deleted file mode 100644
index 5eafc17..0000000
--- a/patches/gcc/3.4.6/100-uclibc-conf.patch
+++ /dev/null
@@ -1,492 +0,0 @@
-diff -durN gcc-3.4.6.orig/boehm-gc/configure gcc-3.4.6/boehm-gc/configure
---- gcc-3.4.6.orig/boehm-gc/configure 2006-03-06 04:55:49.000000000 +0100
-+++ gcc-3.4.6/boehm-gc/configure 2007-08-15 22:49:47.000000000 +0200
-@@ -1947,6 +1947,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -durN gcc-3.4.6.orig/boehm-gc/ltconfig gcc-3.4.6/boehm-gc/ltconfig
---- gcc-3.4.6.orig/boehm-gc/ltconfig 2002-11-20 16:59:07.000000000 +0100
-+++ gcc-3.4.6/boehm-gc/ltconfig 2007-08-15 22:49:47.000000000 +0200
-@@ -1981,6 +1981,23 @@
- fi
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+ file_magic_cmd=/usr/bin/file
-+ file_magic_test_file=`echo /lib/libuClibc-*.so`
-+
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- version_type=sunos
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-diff -durN gcc-3.4.6.orig/gcc/config/alpha/linux-elf.h gcc-3.4.6/gcc/config/alpha/linux-elf.h
---- gcc-3.4.6.orig/gcc/config/alpha/linux-elf.h 2003-09-27 06:48:30.000000000 +0200
-+++ gcc-3.4.6/gcc/config/alpha/linux-elf.h 2007-08-15 22:49:47.000000000 +0200
-@@ -27,7 +27,11 @@
- #define SUBTARGET_EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
- #define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
-
- #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
-diff -durN gcc-3.4.6.orig/gcc/config/arm/linux-elf.h gcc-3.4.6/gcc/config/arm/linux-elf.h
---- gcc-3.4.6.orig/gcc/config/arm/linux-elf.h 2004-01-31 07:18:40.000000000 +0100
-+++ gcc-3.4.6/gcc/config/arm/linux-elf.h 2007-08-15 22:49:47.000000000 +0200
-@@ -80,6 +80,11 @@
- #define ENDFILE_SPEC \
- "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "%{h*} %{version:-v} \
- %{b} %{Wl,*:%*} \
-@@ -87,7 +92,7 @@
- %{shared:-shared} \
- %{symbolic:-Bsymbolic} \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
- -X \
- %{mbig-endian:-EB}" \
- SUBTARGET_EXTRA_LINK_SPEC
-diff -durN gcc-3.4.6.orig/gcc/config/cris/linux.h gcc-3.4.6/gcc/config/cris/linux.h
---- gcc-3.4.6.orig/gcc/config/cris/linux.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/cris/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -79,6 +79,25 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
-+#ifdef USE_UCLIBC
-+
-+#undef CRIS_SUBTARGET_VERSION
-+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+
-+#undef CRIS_LINK_SUBTARGET_SPEC
-+#define CRIS_LINK_SUBTARGET_SPEC \
-+ "-mcrislinux\
-+ -rpath-link include/asm/../..%s\
-+ %{shared} %{static}\
-+ %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
-+ %{!shared: \
-+ %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
-+ %{!r:%{O2|O3: --gc-sections}}"
-+
-+#else /* USE_UCLIBC */
-+
- #undef CRIS_SUBTARGET_VERSION
- #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-
-@@ -93,6 +112,8 @@
- %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
- %{!r:%{O2|O3: --gc-sections}}"
-
-+#endif /* USE_UCLIBC */
-+
-
- /* Node: Run-time Target */
-
-diff -durN gcc-3.4.6.orig/gcc/config/i386/linux64.h gcc-3.4.6/gcc/config/i386/linux64.h
---- gcc-3.4.6.orig/gcc/config/i386/linux64.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/i386/linux64.h 2007-08-15 22:49:47.000000000 +0200
-@@ -54,14 +54,21 @@
- When the -shared link option is used a final link is not being
- done. */
-
-+#ifdef USE_UCLIBC
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
-+ %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
-+ %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
- %{static:-static}}"
-
- #define MULTILIB_DEFAULTS { "m64" }
-diff -durN gcc-3.4.6.orig/gcc/config/i386/linux.h gcc-3.4.6/gcc/config/i386/linux.h
---- gcc-3.4.6.orig/gcc/config/i386/linux.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/i386/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -110,22 +110,21 @@
-
- #undef LINK_SPEC
- #ifdef USE_GNULIBC_1
--#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
-- %{!shared: \
-- %{!ibcs: \
-- %{!static: \
-- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
-- %{static:-static}}}"
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.1"
- #else
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
-+#endif
- #define LINK_SPEC "-m elf_i386 %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
--#endif
-
- /* A C statement (sans semicolon) to output to the stdio stream
- FILE the assembler definition of uninitialized global DECL named
-diff -durN gcc-3.4.6.orig/gcc/config/ia64/linux.h gcc-3.4.6/gcc/config/ia64/linux.h
---- gcc-3.4.6.orig/gcc/config/ia64/linux.h 2004-02-07 08:56:17.000000000 +0100
-+++ gcc-3.4.6/gcc/config/ia64/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -37,13 +37,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
-
-diff -durN gcc-3.4.6.orig/gcc/config/m68k/linux.h gcc-3.4.6/gcc/config/m68k/linux.h
---- gcc-3.4.6.orig/gcc/config/m68k/linux.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/m68k/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -131,12 +131,17 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static}}"
-
- /* For compatibility with linux/a.out */
-diff -durN gcc-3.4.6.orig/gcc/config/mips/linux.h gcc-3.4.6/gcc/config/mips/linux.h
---- gcc-3.4.6.orig/gcc/config/mips/linux.h 2004-06-16 03:42:25.000000000 +0200
-+++ gcc-3.4.6/gcc/config/mips/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -109,6 +109,11 @@
-
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #define LINK_SPEC \
- "%(endian_spec) \
- %{shared:-shared} \
-@@ -116,7 +121,7 @@
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
-
- #undef SUBTARGET_ASM_SPEC
-diff -durN gcc-3.4.6.orig/gcc/config/pa/pa-linux.h gcc-3.4.6/gcc/config/pa/pa-linux.h
---- gcc-3.4.6.orig/gcc/config/pa/pa-linux.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/pa/pa-linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -77,13 +77,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
- /* glibc's profiling functions don't need gcc to allocate counters. */
-diff -durN gcc-3.4.6.orig/gcc/config/rs6000/linux.h gcc-3.4.6/gcc/config/rs6000/linux.h
---- gcc-3.4.6.orig/gcc/config/rs6000/linux.h 2005-03-17 11:41:18.000000000 +0100
-+++ gcc-3.4.6/gcc/config/rs6000/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -69,7 +69,11 @@
- #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
-
- #undef LINK_OS_DEFAULT_SPEC
-+#ifdef USE_UCLIBC
-+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
-+#else
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-+#endif
-
- #define LINK_GCC_C_SEQUENCE_SPEC \
- "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
-diff -durN gcc-3.4.6.orig/gcc/config/rs6000/sysv4.h gcc-3.4.6/gcc/config/rs6000/sysv4.h
---- gcc-3.4.6.orig/gcc/config/rs6000/sysv4.h 2005-10-30 00:35:37.000000000 +0200
-+++ gcc-3.4.6/gcc/config/rs6000/sysv4.h 2007-08-15 22:49:47.000000000 +0200
-@@ -949,6 +949,7 @@
- mcall-linux : %(link_os_linux) ; \
- mcall-gnu : %(link_os_gnu) ; \
- mcall-netbsd : %(link_os_netbsd) ; \
-+ mcall-linux-uclibc : %(link_os_linux_uclibc); \
- mcall-openbsd: %(link_os_openbsd) ; \
- : %(link_os_default) }"
-
-@@ -1127,6 +1128,10 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-
-+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
-+
- #if defined(HAVE_LD_EH_FRAME_HDR)
- # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
- #endif
-@@ -1293,6 +1298,7 @@
- { "link_os_sim", LINK_OS_SIM_SPEC }, \
- { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
- { "link_os_linux", LINK_OS_LINUX_SPEC }, \
-+ { "link_os_linux_uclibc", LINK_OS_LINUX_UCLIBC_SPEC }, \
- { "link_os_gnu", LINK_OS_GNU_SPEC }, \
- { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
-diff -durN gcc-3.4.6.orig/gcc/config/s390/linux.h gcc-3.4.6/gcc/config/s390/linux.h
---- gcc-3.4.6.orig/gcc/config/s390/linux.h 2003-11-29 04:08:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/s390/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -77,6 +77,13 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
-
-+#ifdef USE_UCLIBC
-+#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC \
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-@@ -86,8 +93,8 @@
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker: \
-- %{m31:-dynamic-linker /lib/ld.so.1} \
-- %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
-+ %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
-+ %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
-
-
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-diff -durN gcc-3.4.6.orig/gcc/config/sh/linux.h gcc-3.4.6/gcc/config/sh/linux.h
---- gcc-3.4.6.orig/gcc/config/sh/linux.h 2004-01-12 03:29:13.000000000 +0100
-+++ gcc-3.4.6/gcc/config/sh/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -73,11 +73,16 @@
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
- #undef SUBTARGET_LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define SUBTARGET_LINK_SPEC \
- "%{shared:-shared} \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}"
-
- #undef LIB_SPEC
-diff -durN gcc-3.4.6.orig/gcc/config/sparc/linux64.h gcc-3.4.6/gcc/config/sparc/linux64.h
---- gcc-3.4.6.orig/gcc/config/sparc/linux64.h 2004-06-06 05:55:17.000000000 +0200
-+++ gcc-3.4.6/gcc/config/sparc/linux64.h 2007-08-15 22:49:47.000000000 +0200
-@@ -167,12 +167,17 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}} \
- "
-
-diff -durN gcc-3.4.6.orig/gcc/config/sparc/linux.h gcc-3.4.6/gcc/config/sparc/linux.h
---- gcc-3.4.6.orig/gcc/config/sparc/linux.h 2004-06-06 05:55:17.000000000 +0200
-+++ gcc-3.4.6/gcc/config/sparc/linux.h 2007-08-15 22:49:47.000000000 +0200
-@@ -162,13 +162,18 @@
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
- %{static:-static}}}"
- #else
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
- #endif
-
-diff -durN gcc-3.4.6.orig/gcc/config/t-linux-uclibc gcc-3.4.6/gcc/config/t-linux-uclibc
---- gcc-3.4.6.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/t-linux-uclibc 2007-08-15 22:49:47.000000000 +0200
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-3.4.6.orig/gcc/config.gcc gcc-3.4.6/gcc/config.gcc
---- gcc-3.4.6.orig/gcc/config.gcc 2005-07-19 23:08:48.000000000 +0200
-+++ gcc-3.4.6/gcc/config.gcc 2007-08-15 22:49:47.000000000 +0200
-@@ -2322,6 +2322,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
-+esac
-+
- # Support for --with-cpu and related options (and a few unrelated options,
- # too).
- case ${with_cpu} in
-diff -durN gcc-3.4.6.orig/libtool.m4 gcc-3.4.6/libtool.m4
---- gcc-3.4.6.orig/libtool.m4 2004-05-18 11:09:14.000000000 +0200
-+++ gcc-3.4.6/libtool.m4 2007-08-15 22:49:47.000000000 +0200
-@@ -689,6 +689,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-diff -durN gcc-3.4.6.orig/ltconfig gcc-3.4.6/ltconfig
---- gcc-3.4.6.orig/ltconfig 2004-03-05 22:05:41.000000000 +0100
-+++ gcc-3.4.6/ltconfig 2007-08-15 22:49:47.000000000 +0200
-@@ -602,6 +602,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
-+linux-uclibc*) ;;
- linux-gnu*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-@@ -1262,6 +1263,24 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-3.4.6.orig/null gcc-3.4.6/null
---- gcc-3.4.6.orig/null 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/null 2007-08-15 22:49:47.000000000 +0200
-@@ -0,0 +1 @@
-+~/dev
diff --git a/patches/gcc/3.4.6/110-uclibc-locale.patch b/patches/gcc/3.4.6/110-uclibc-locale.patch
deleted file mode 100644
index 444fcf9..0000000
--- a/patches/gcc/3.4.6/110-uclibc-locale.patch
+++ /dev/null
@@ -1,3255 +0,0 @@
-diff -durN gcc-3.4.6.orig/libstdc++-v3/acinclude.m4 gcc-3.4.6/libstdc++-v3/acinclude.m4
---- gcc-3.4.6.orig/libstdc++-v3/acinclude.m4 2004-10-28 23:52:41.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/acinclude.m4 2007-08-15 22:51:01.000000000 +0200
-@@ -1015,7 +1015,7 @@
- AC_MSG_CHECKING([for C locale to use])
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # If they didn't use this option switch, or if they specified --enable
- # with no specific model, we'll have to look for one. If they
-@@ -1031,6 +1031,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case x${target_os} in
-+ x*-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1157,6 +1160,41 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-3.4.6.orig/libstdc++-v3/aclocal.m4 gcc-3.4.6/libstdc++-v3/aclocal.m4
---- gcc-3.4.6.orig/libstdc++-v3/aclocal.m4 2004-10-28 23:52:41.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/aclocal.m4 2007-08-15 22:51:01.000000000 +0200
-@@ -1044,6 +1044,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case x${target_os} in
-+ x*-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1170,6 +1173,41 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,115 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out, const int __size, const char* __fmt,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,59 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#endif // GLIBC 2.3 and later
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = 0;
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-3.4.6/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,698 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ ;
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ unsigned char uc;
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ {
-+ uc = static_cast<unsigned char>(money_base::_S_atoms[__i]);
-+ _M_data->_M_atoms[__i] = btowc(uc);
-+ }
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union __s_and_w { const char *__s; unsigned int __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w);
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ unsigned char uc;
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ {
-+ uc = static_cast<unsigned char>(money_base::_S_atoms[__i]);
-+ _M_data->_M_atoms[__i] = btowc(uc);
-+ }
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union __s_and_w { const char *__s; unsigned int __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w);
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,183 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = strlen(_M_data->_M_truename);
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = strlen(_M_data->_M_falsename);
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_S_get_c_locale());
-+#endif
-+ // Use ctype::widen code without the facet...
-+ unsigned char uc;
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ {
-+ uc = static_cast<unsigned char>(__num_base::_S_atoms_out[__i]);
-+ _M_data->_M_atoms_out[__i] = btowc(uc);
-+ }
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ {
-+ uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__j]);
-+ _M_data->_M_atoms_in[__j] = btowc(uc);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union __s_and_w { const char *__s; unsigned int __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w);
-+#endif
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = wcslen(_M_data->_M_truename);
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename);
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-3.4.6/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,356 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT, __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_FMT, __cloc));
-+ _M_data->_M_date_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_FMT, __cloc));
-+ _M_data->_M_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT, __cloc));
-+ _M_data->_M_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_T_FMT, __cloc));
-+ _M_data->_M_date_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_T_FMT, __cloc));
-+ _M_data->_M_date_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc));
-+ _M_data->_M_am = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WAM_STR, __cloc));
-+ _M_data->_M_pm = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WPM_STR, __cloc));
-+ _M_data->_M_am_pm_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc));
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_1, __cloc));
-+ _M_data->_M_day2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_2, __cloc));
-+ _M_data->_M_day3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_3, __cloc));
-+ _M_data->_M_day4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_4, __cloc));
-+ _M_data->_M_day5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_5, __cloc));
-+ _M_data->_M_day6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_6, __cloc));
-+ _M_data->_M_day7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_7, __cloc));
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_1, __cloc));
-+ _M_data->_M_aday2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_2, __cloc));
-+ _M_data->_M_aday3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_3, __cloc));
-+ _M_data->_M_aday4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_4, __cloc));
-+ _M_data->_M_aday5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_5, __cloc));
-+ _M_data->_M_aday6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_6, __cloc));
-+ _M_data->_M_aday7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_7, __cloc));
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_1, __cloc));
-+ _M_data->_M_month02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_2, __cloc));
-+ _M_data->_M_month03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_3, __cloc));
-+ _M_data->_M_month04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_4, __cloc));
-+ _M_data->_M_month05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_5, __cloc));
-+ _M_data->_M_month06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_6, __cloc));
-+ _M_data->_M_month07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_7, __cloc));
-+ _M_data->_M_month08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_8, __cloc));
-+ _M_data->_M_month09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_9, __cloc));
-+ _M_data->_M_month10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_10, __cloc));
-+ _M_data->_M_month11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_11, __cloc));
-+ _M_data->_M_month12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_12, __cloc));
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_1, __cloc));
-+ _M_data->_M_amonth02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_2, __cloc));
-+ _M_data->_M_amonth03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_3, __cloc));
-+ _M_data->_M_amonth04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_4, __cloc));
-+ _M_data->_M_amonth05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_5, __cloc));
-+ _M_data->_M_amonth06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_6, __cloc));
-+ _M_data->_M_amonth07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_7, __cloc));
-+ _M_data->_M_amonth08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_8, __cloc));
-+ _M_data->_M_amonth09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_9, __cloc));
-+ _M_data->_M_amonth10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_10, __cloc));
-+ _M_data->_M_amonth11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_11, __cloc));
-+ _M_data->_M_amonth12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_12, __cloc));
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-3.4.6/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-3.4.6.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_base.h
---- gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_base.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,58 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ struct ctype_base
-+ {
-+ // Note: In uClibc, the following two types depend on configuration.
-+
-+ // Non-standard typedefs.
-+ typedef const __ctype_touplow_t* __to_type;
-+
-+ // NB: Offsets into ctype<char>::_M_table force a particular size
-+ // on the mask type. Because of this, we don't use an enum.
-+ typedef __ctype_mask_t mask;
-+ static const mask upper = _ISupper;
-+ static const mask lower = _ISlower;
-+ static const mask alpha = _ISalpha;
-+ static const mask digit = _ISdigit;
-+ static const mask xdigit = _ISxdigit;
-+ static const mask space = _ISspace;
-+ static const mask print = _ISprint;
-+ static const mask graph = _ISalpha | _ISdigit | _ISpunct;
-+ static const mask cntrl = _IScntrl;
-+ static const mask punct = _ISpunct;
-+ static const mask alnum = _ISalpha | _ISdigit;
-+ };
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_inline.h
---- gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_inline.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_inline.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,69 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-+// functions go in ctype.cc
-+
-+ bool
-+ ctype<char>::
-+ is(mask __m, char __c) const
-+ { return _M_table[static_cast<unsigned char>(__c)] & __m; }
-+
-+ const char*
-+ ctype<char>::
-+ is(const char* __low, const char* __high, mask* __vec) const
-+ {
-+ while (__low < __high)
-+ *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
-+ return __high;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_is(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
-+ ++__low;
-+ return __low;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_not(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
-+ ++__low;
-+ return __low;
-+ }
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_noninline.h
---- gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,92 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ const ctype_base::mask*
-+ ctype<char>::classic_table() throw()
-+ { return __C_ctype_b; }
-+
-+ ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ char
-+ ctype<char>::do_toupper(char __c) const
-+ { return _M_toupper[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_toupper(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_toupper[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
-+
-+ char
-+ ctype<char>::do_tolower(char __c) const
-+ { return _M_tolower[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_tolower(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_tolower[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
-diff -durN gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/os_defines.h gcc-3.4.6/libstdc++-v3/config/os/uclibc/os_defines.h
---- gcc-3.4.6.orig/libstdc++-v3/config/os/uclibc/os_defines.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/config/os/uclibc/os_defines.h 2007-08-15 22:51:01.000000000 +0200
-@@ -0,0 +1,44 @@
-+// Specific definitions for GNU/Linux -*- C++ -*-
-+
-+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+#ifndef _GLIBCXX_OS_DEFINES
-+#define _GLIBCXX_OS_DEFINES 1
-+
-+// System-specific #define, typedefs, corrections, etc, go here. This
-+// file will come before all others.
-+
-+// This keeps isanum, et al from being propagated as macros.
-+#define __NO_CTYPE 1
-+
-+#include <features.h>
-+
-+// We must not see the optimized string functions GNU libc defines.
-+#define __NO_STRING_INLINES
-+
-+#endif
-diff -durN gcc-3.4.6.orig/libstdc++-v3/configure gcc-3.4.6/libstdc++-v3/configure
---- gcc-3.4.6.orig/libstdc++-v3/configure 2005-02-01 07:31:23.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/configure 2007-08-15 22:51:01.000000000 +0200
-@@ -4012,6 +4012,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -5679,7 +5684,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5704,6 +5709,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case x${target_os} in
-+ xlinux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu)
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5916,6 +5924,77 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-3.4.6.orig/libstdc++-v3/configure.host gcc-3.4.6/libstdc++-v3/configure.host
---- gcc-3.4.6.orig/libstdc++-v3/configure.host 2004-10-05 18:32:49.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/configure.host 2007-08-15 22:51:01.000000000 +0200
-@@ -217,6 +217,12 @@
- ;;
- esac
-
-+# Override for uClibc since linux-uclibc gets mishandled above.
-+case "${host_os}" in
-+ *-uclibc*)
-+ os_include_dir="os/uclibc"
-+ ;;
-+esac
-
- # Set any OS-dependent and CPU-dependent bits.
- # THIS TABLE IS SORTED. KEEP IT THAT WAY.
-diff -durN gcc-3.4.6.orig/libstdc++-v3/crossconfig.m4 gcc-3.4.6/libstdc++-v3/crossconfig.m4
---- gcc-3.4.6.orig/libstdc++-v3/crossconfig.m4 2005-02-01 07:31:23.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/crossconfig.m4 2007-08-15 22:51:01.000000000 +0200
-@@ -138,6 +138,99 @@
- ;;
- esac
- ;;
-+ *-uclibc*)
-+# Temporary hack until we implement the float versions of the libm funcs
-+ AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-+ machine/endian.h machine/param.h sys/machine.h sys/types.h \
-+ fp.h float.h endian.h inttypes.h locale.h float.h stdint.h])
-+ SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+ AC_SUBST(SECTION_FLAGS)
-+ GLIBCXX_CHECK_LINKER_FEATURES
-+ GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-+ GLIBCXX_CHECK_WCHAR_T_SUPPORT
-+
-+ # For LFS.
-+ AC_DEFINE(HAVE_INT64_T)
-+ case "$target" in
-+ *-uclinux*)
-+ # Don't enable LFS with uClinux
-+ ;;
-+ *)
-+ AC_DEFINE(_GLIBCXX_USE_LFS)
-+ esac
-+
-+ # For showmanyc_helper().
-+ AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
-+ GLIBCXX_CHECK_POLL
-+ GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
-+
-+ # For xsputn_2().
-+ AC_CHECK_HEADERS(sys/uio.h)
-+ GLIBCXX_CHECK_WRITEV
-+
-+# AC_DEFINE(HAVE_ACOSF)
-+# AC_DEFINE(HAVE_ASINF)
-+# AC_DEFINE(HAVE_ATANF)
-+# AC_DEFINE(HAVE_ATAN2F)
-+ AC_DEFINE(HAVE_CEILF)
-+ AC_DEFINE(HAVE_COPYSIGN)
-+# AC_DEFINE(HAVE_COPYSIGNF)
-+# AC_DEFINE(HAVE_COSF)
-+# AC_DEFINE(HAVE_COSHF)
-+# AC_DEFINE(HAVE_EXPF)
-+# AC_DEFINE(HAVE_FABSF)
-+ AC_DEFINE(HAVE_FINITE)
-+ AC_DEFINE(HAVE_FINITEF)
-+ AC_DEFINE(HAVE_FLOORF)
-+# AC_DEFINE(HAVE_FMODF)
-+# AC_DEFINE(HAVE_FREXPF)
-+ AC_DEFINE(HAVE_HYPOT)
-+# AC_DEFINE(HAVE_HYPOTF)
-+ AC_DEFINE(HAVE_ISINF)
-+ AC_DEFINE(HAVE_ISINFF)
-+ AC_DEFINE(HAVE_ISNAN)
-+ AC_DEFINE(HAVE_ISNANF)
-+# AC_DEFINE(HAVE_LOGF)
-+# AC_DEFINE(HAVE_LOG10F)
-+# AC_DEFINE(HAVE_MODFF)
-+# AC_DEFINE(HAVE_SINF)
-+# AC_DEFINE(HAVE_SINHF)
-+# AC_DEFINE(HAVE_SINCOS)
-+# AC_DEFINE(HAVE_SINCOSF)
-+ AC_DEFINE(HAVE_SQRTF)
-+# AC_DEFINE(HAVE_TANF)
-+# AC_DEFINE(HAVE_TANHF)
-+ if test x"long_double_math_on_this_cpu" = x"yes"; then
-+ AC_MSG_ERROR([long_double_math_on_this_cpu is yes!])
-+# AC_DEFINE(HAVE_ACOSL)
-+# AC_DEFINE(HAVE_ASINL)
-+# AC_DEFINE(HAVE_ATANL)
-+# AC_DEFINE(HAVE_ATAN2L)
-+# AC_DEFINE(HAVE_CEILL)
-+# AC_DEFINE(HAVE_COPYSIGNL)
-+# AC_DEFINE(HAVE_COSL)
-+# AC_DEFINE(HAVE_COSHL)
-+# AC_DEFINE(HAVE_EXPL)
-+# AC_DEFINE(HAVE_FABSL)
-+# AC_DEFINE(HAVE_FINITEL)
-+# AC_DEFINE(HAVE_FLOORL)
-+# AC_DEFINE(HAVE_FMODL)
-+# AC_DEFINE(HAVE_FREXPL)
-+# AC_DEFINE(HAVE_HYPOTL)
-+# AC_DEFINE(HAVE_ISINFL)
-+# AC_DEFINE(HAVE_ISNANL)
-+# AC_DEFINE(HAVE_LOGL)
-+# AC_DEFINE(HAVE_LOG10L)
-+# AC_DEFINE(HAVE_MODFL)
-+# AC_DEFINE(HAVE_POWL)
-+# AC_DEFINE(HAVE_SINL)
-+# AC_DEFINE(HAVE_SINHL)
-+# AC_DEFINE(HAVE_SINCOSL)
-+# AC_DEFINE(HAVE_SQRTL)
-+# AC_DEFINE(HAVE_TANL)
-+# AC_DEFINE(HAVE_TANHL)
-+ fi
-+ ;;
- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
- AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
- machine/endian.h machine/param.h sys/machine.h sys/types.h \
-@@ -152,7 +245,7 @@
- AC_DEFINE(HAVE_INT64_T)
- case "$target" in
- *-uclinux*)
-- # Don't enable LFS with uClibc
-+ # Don't enable LFS with uClinux
- ;;
- *)
- AC_DEFINE(_GLIBCXX_USE_LFS)
-diff -durN gcc-3.4.6.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-3.4.6/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-3.4.6.orig/libstdc++-v3/include/c_compatibility/wchar.h 2003-12-09 04:51:46.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/include/c_compatibility/wchar.h 2007-08-15 22:51:01.000000000 +0200
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-diff -durN gcc-3.4.6.orig/libstdc++-v3/include/c_std/std_cwchar.h gcc-3.4.6/libstdc++-v3/include/c_std/std_cwchar.h
---- gcc-3.4.6.orig/libstdc++-v3/include/c_std/std_cwchar.h 2004-07-20 10:52:12.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/include/c_std/std_cwchar.h 2007-08-15 22:51:01.000000000 +0200
-@@ -179,7 +179,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/3.4.6/120-libstdc++-pic.patch b/patches/gcc/3.4.6/120-libstdc++-pic.patch
deleted file mode 100644
index 2b55a47..0000000
--- a/patches/gcc/3.4.6/120-libstdc++-pic.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am gcc-3.4.6/libstdc++-v3/src/Makefile.am
---- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am 2004-04-16 21:08:35.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/src/Makefile.am 2007-08-15 22:52:23.000000000 +0200
-@@ -210,6 +210,10 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in gcc-3.4.6/libstdc++-v3/src/Makefile.in
---- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in 2004-04-16 21:08:35.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/src/Makefile.in 2007-08-15 22:52:23.000000000 +0200
-@@ -592,7 +592,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -625,6 +625,7 @@
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-data-local \
- install-exec install-exec-am install-info install-info-am \
-+ install-exec-local \
- install-man install-strip install-toolexeclibLTLIBRARIES \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
-@@ -709,6 +710,11 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/3.4.6/130-index_macro.patch b/patches/gcc/3.4.6/130-index_macro.patch
deleted file mode 100644
index 6f4d57a..0000000
--- a/patches/gcc/3.4.6/130-index_macro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/rope gcc-3.4.6/libstdc++-v3/include/ext/rope
---- gcc-3.4.6.orig/libstdc++-v3/include/ext/rope 2005-01-16 23:08:43.000000000 +0100
-+++ gcc-3.4.6/libstdc++-v3/include/ext/rope 2007-08-15 22:53:37.000000000 +0200
-@@ -58,6 +58,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h 2004-09-08 15:36:04.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h 2007-08-15 22:53:37.000000000 +0200
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- namespace __gnu_cxx
- {
- using std::size_t;
diff --git a/patches/gcc/3.4.6/140-arm-ldm-peephole.patch b/patches/gcc/3.4.6/140-arm-ldm-peephole.patch
deleted file mode 100644
index 81a0ac8..0000000
--- a/patches/gcc/3.4.6/140-arm-ldm-peephole.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.c gcc-3.4.6/gcc/config/arm/arm.c
---- gcc-3.4.6.orig/gcc/config/arm/arm.c 2005-10-01 15:31:38.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/arm.c 2007-08-15 22:54:59.000000000 +0200
-@@ -4857,6 +4857,11 @@
- *load_offset = unsorted_offsets[order[0]];
- }
-
-+ /* For XScale a two-word LDM is a performance loss, so only do this if
-+ size is more important. See comments in arm_gen_load_multiple. */
-+ if (nops == 2 && arm_tune_xscale && !optimize_size)
-+ return 0;
-+
- if (unsorted_offsets[order[0]] == 0)
- return 1; /* ldmia */
-
-@@ -5083,6 +5088,11 @@
- *load_offset = unsorted_offsets[order[0]];
- }
-
-+ /* For XScale a two-word LDM is a performance loss, so only do this if
-+ size is more important. See comments in arm_gen_load_multiple. */
-+ if (nops == 2 && arm_tune_xscale && !optimize_size)
-+ return 0;
-+
- if (unsorted_offsets[order[0]] == 0)
- return 1; /* stmia */
-
-diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.md gcc-3.4.6/gcc/config/arm/arm.md
---- gcc-3.4.6.orig/gcc/config/arm/arm.md 2005-10-01 15:31:38.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/arm.md 2007-08-15 22:54:59.000000000 +0200
-@@ -8811,13 +8811,16 @@
- (set_attr "length" "4,8,8")]
- )
-
-+; Try to convert LDR+LDR+arith into [add+]LDM+arith
-+; On XScale, LDM is always slower than two LDRs, so only do this if
-+; optimising for size.
- (define_insn "*arith_adjacentmem"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
- (match_operator:SI 1 "shiftable_operator"
- [(match_operand:SI 2 "memory_operand" "m")
- (match_operand:SI 3 "memory_operand" "m")]))
- (clobber (match_scratch:SI 4 "=r"))]
-- "TARGET_ARM && adjacent_mem_locations (operands[2], operands[3])"
-+ "TARGET_ARM && (!arm_tune_xscale || optimize_size) && adjacent_mem_locations (operands[2], operands[3])"
- "*
- {
- rtx ldm[3];
-@@ -8852,6 +8855,8 @@
- }
- if (val1 && val2)
- {
-+ /* This would be a loss on a Harvard core, but adjacent_mem_locations()
-+ will prevent it from happening. */
- rtx ops[3];
- ldm[0] = ops[0] = operands[4];
- ops[1] = XEXP (XEXP (operands[2], 0), 0);
-diff -durN gcc-3.4.6.orig/gcc/genpeep.c gcc-3.4.6/gcc/genpeep.c
---- gcc-3.4.6.orig/gcc/genpeep.c 2003-07-05 07:27:22.000000000 +0200
-+++ gcc-3.4.6/gcc/genpeep.c 2007-08-15 22:54:59.000000000 +0200
-@@ -381,6 +381,7 @@
- printf ("#include \"recog.h\"\n");
- printf ("#include \"except.h\"\n\n");
- printf ("#include \"function.h\"\n\n");
-+ printf ("#include \"flags.h\"\n\n");
-
- printf ("#ifdef HAVE_peephole\n");
- printf ("extern rtx peep_operand[];\n\n");
diff --git a/patches/gcc/3.4.6/150-arm-ldm.patch b/patches/gcc/3.4.6/150-arm-ldm.patch
deleted file mode 100644
index 18ea493..0000000
--- a/patches/gcc/3.4.6/150-arm-ldm.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.c gcc-3.4.6/gcc/config/arm/arm.c
---- gcc-3.4.6.orig/gcc/config/arm/arm.c 2007-08-15 22:56:20.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/arm.c 2007-08-15 22:56:20.000000000 +0200
-@@ -8524,6 +8524,26 @@
- return_used_this_function = 0;
- }
-
-+/* Return the number (counting from 0) of
-+ the least significant set bit in MASK. */
-+
-+#ifdef __GNUC__
-+inline
-+#endif
-+static int
-+number_of_first_bit_set (mask)
-+ int mask;
-+{
-+ int bit;
-+
-+ for (bit = 0;
-+ (mask & (1 << bit)) == 0;
-+ ++bit)
-+ continue;
-+
-+ return bit;
-+}
-+
- const char *
- arm_output_epilogue (rtx sibling)
- {
-@@ -8757,27 +8777,47 @@
- saved_regs_mask |= (1 << PC_REGNUM);
- }
-
-- /* Load the registers off the stack. If we only have one register
-- to load use the LDR instruction - it is faster. */
-- if (saved_regs_mask == (1 << LR_REGNUM))
-- {
-- /* The exception handler ignores the LR, so we do
-- not really need to load it off the stack. */
-- if (eh_ofs)
-- asm_fprintf (f, "\tadd\t%r, %r, #4\n", SP_REGNUM, SP_REGNUM);
-- else
-- asm_fprintf (f, "\tldr\t%r, [%r], #4\n", LR_REGNUM, SP_REGNUM);
-- }
-- else if (saved_regs_mask)
-+ if (saved_regs_mask)
- {
-- if (saved_regs_mask & (1 << SP_REGNUM))
-- /* Note - write back to the stack register is not enabled
-- (ie "ldmfd sp!..."). We know that the stack pointer is
-- in the list of registers and if we add writeback the
-- instruction becomes UNPREDICTABLE. */
-- print_multi_reg (f, "ldmfd\t%r", SP_REGNUM, saved_regs_mask);
-+ /* Load the registers off the stack. If we only have one register
-+ to load use the LDR instruction - it is faster. */
-+ if (bit_count (saved_regs_mask) == 1)
-+ {
-+ int reg = number_of_first_bit_set (saved_regs_mask);
-+
-+ switch (reg)
-+ {
-+ case SP_REGNUM:
-+ /* Mustn't use base writeback when loading SP. */
-+ asm_fprintf (f, "\tldr\t%r, [%r]\n", SP_REGNUM, SP_REGNUM);
-+ break;
-+
-+ case LR_REGNUM:
-+ if (eh_ofs)
-+ {
-+ /* The exception handler ignores the LR, so we do
-+ not really need to load it off the stack. */
-+ asm_fprintf (f, "\tadd\t%r, %r, #4\n", SP_REGNUM, SP_REGNUM);
-+ break;
-+ }
-+ /* else fall through */
-+
-+ default:
-+ asm_fprintf (f, "\tldr\t%r, [%r], #4\n", reg, SP_REGNUM);
-+ break;
-+ }
-+ }
- else
-- print_multi_reg (f, "ldmfd\t%r!", SP_REGNUM, saved_regs_mask);
-+ {
-+ if (saved_regs_mask & (1 << SP_REGNUM))
-+ /* Note - write back to the stack register is not enabled
-+ (ie "ldmfd sp!..."). We know that the stack pointer is
-+ in the list of registers and if we add writeback the
-+ instruction becomes UNPREDICTABLE. */
-+ print_multi_reg (f, "ldmfd\t%r", SP_REGNUM, saved_regs_mask);
-+ else
-+ print_multi_reg (f, "ldmfd\t%r!", SP_REGNUM, saved_regs_mask);
-+ }
- }
-
- if (current_function_pretend_args_size)
-@@ -11405,22 +11445,6 @@
- }
- }
-
--/* Return the number (counting from 0) of
-- the least significant set bit in MASK. */
--
--inline static int
--number_of_first_bit_set (int mask)
--{
-- int bit;
--
-- for (bit = 0;
-- (mask & (1 << bit)) == 0;
-- ++bit)
-- continue;
--
-- return bit;
--}
--
- /* Generate code to return from a thumb function.
- If 'reg_containing_return_addr' is -1, then the return address is
- actually on the stack, at the stack pointer. */
diff --git a/patches/gcc/3.4.6/160-arm-ldm-peephole2.patch b/patches/gcc/3.4.6/160-arm-ldm-peephole2.patch
deleted file mode 100644
index 395c516..0000000
--- a/patches/gcc/3.4.6/160-arm-ldm-peephole2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.c gcc-3.4.6/gcc/config/arm/arm.c
---- gcc-3.4.6.orig/gcc/config/arm/arm.c 2007-08-15 22:57:51.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/arm.c 2007-08-15 22:57:51.000000000 +0200
-@@ -4572,6 +4572,10 @@
- int
- adjacent_mem_locations (rtx a, rtx b)
- {
-+ /* We don't guarantee to preserve the order of these memory refs. */
-+ if (volatile_refs_p (a) || volatile_refs_p (b))
-+ return 0;
-+
- if ((GET_CODE (XEXP (a, 0)) == REG
- || (GET_CODE (XEXP (a, 0)) == PLUS
- && GET_CODE (XEXP (XEXP (a, 0), 1)) == CONST_INT))
-@@ -4611,6 +4615,17 @@
- return 0;
-
- val_diff = val1 - val0;
-+
-+ if (arm_ld_sched)
-+ {
-+ /* If the target has load delay slots, then there's no benefit
-+ to using an ldm instruction unless the offset is zero and
-+ we are optimizing for size. */
-+ return (optimize_size && (REGNO (reg0) == REGNO (reg1))
-+ && (val0 == 0 || val1 == 0 || val0 == 4 || val1 == 4)
-+ && (val_diff == 4 || val_diff == -4));
-+ }
-+
- return ((REGNO (reg0) == REGNO (reg1))
- && (val_diff == 4 || val_diff == -4));
- }
diff --git a/patches/gcc/3.4.6/170-sdk-libstdc++-includes.patch b/patches/gcc/3.4.6/170-sdk-libstdc++-includes.patch
deleted file mode 100644
index f599b59..0000000
--- a/patches/gcc/3.4.6/170-sdk-libstdc++-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-3.4.6.orig/libstdc++-v3/fragment.am gcc-3.4.6/libstdc++-v3/fragment.am
---- gcc-3.4.6.orig/libstdc++-v3/fragment.am 2003-08-27 02:38:28.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/fragment.am 2007-08-15 22:59:09.000000000 +0200
-@@ -18,7 +18,7 @@
- $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
-
- # -I/-D flags to pass when compiling.
--AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
-
-
-
-diff -durN gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am gcc-3.4.6/libstdc++-v3/libmath/Makefile.am
---- gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am 2003-08-27 23:29:43.000000000 +0200
-+++ gcc-3.4.6/libstdc++-v3/libmath/Makefile.am 2007-08-15 22:59:09.000000000 +0200
-@@ -32,7 +32,7 @@
-
- libmath_la_SOURCES = stubs.c
-
--AM_CPPFLAGS = $(CANADIAN_INCLUDES)
-+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
-
- # Only compiling "C" sources in this directory.
- LIBTOOL = @LIBTOOL@ --tag CC
diff --git a/patches/gcc/3.4.6/180-pr15068-fix.patch b/patches/gcc/3.4.6/180-pr15068-fix.patch
deleted file mode 100644
index 308f35b..0000000
--- a/patches/gcc/3.4.6/180-pr15068-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/flow.c gcc-3.4.6/gcc/flow.c
---- gcc-3.4.6.orig/gcc/flow.c 2005-09-01 22:51:09.000000000 +0200
-+++ gcc-3.4.6/gcc/flow.c 2007-08-15 23:00:30.000000000 +0200
-@@ -1884,6 +1884,7 @@
- rtx set_src = SET_SRC (pc_set (BB_END (bb)));
- rtx cond_true = XEXP (set_src, 0);
- rtx reg = XEXP (cond_true, 0);
-+ enum rtx_code inv_cond;
-
- if (GET_CODE (reg) == SUBREG)
- reg = SUBREG_REG (reg);
-@@ -1892,11 +1893,13 @@
- in the form of a comparison of a register against zero.
- If the condition is more complex than that, then it is safe
- not to record any information. */
-- if (GET_CODE (reg) == REG
-+ inv_cond = reversed_comparison_code (cond_true, BB_END (bb));
-+ if (inv_cond != UNKNOWN
-+ && GET_CODE (reg) == REG
- && XEXP (cond_true, 1) == const0_rtx)
- {
- rtx cond_false
-- = gen_rtx_fmt_ee (reverse_condition (GET_CODE (cond_true)),
-+ = gen_rtx_fmt_ee (inv_cond,
- GET_MODE (cond_true), XEXP (cond_true, 0),
- XEXP (cond_true, 1));
- if (GET_CODE (XEXP (set_src, 1)) == PC)
diff --git a/patches/gcc/3.4.6/190-all_sh-pr16665-fix.patch b/patches/gcc/3.4.6/190-all_sh-pr16665-fix.patch
deleted file mode 100644
index 7297fca..0000000
--- a/patches/gcc/3.4.6/190-all_sh-pr16665-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/sh/sh.c gcc-3.4.6/gcc/config/sh/sh.c
---- gcc-3.4.6.orig/gcc/config/sh/sh.c 2004-09-03 08:51:30.000000000 +0200
-+++ gcc-3.4.6/gcc/config/sh/sh.c 2007-08-15 23:01:48.000000000 +0200
-@@ -9107,6 +9107,15 @@
- }
- this = FUNCTION_ARG (cum, Pmode, ptr_type_node, 1);
-
-+ /* In PIC case, we set PIC register to compute the target address. We
-+ can use a scratch register to save and restore the original value
-+ except for SHcompact. For SHcompact, use stack. */
-+ if (flag_pic && TARGET_SHCOMPACT)
-+ {
-+ push (PIC_OFFSET_TABLE_REGNUM);
-+ emit_insn (gen_GOTaddr2picreg ());
-+ }
-+
- /* For SHcompact, we only have r0 for a scratch register: r1 is the
- static chain pointer (even if you can't have nested virtual functions
- right now, someone might implement them sometime), and the rest of the
-@@ -9189,8 +9198,24 @@
- assemble_external (function);
- TREE_USED (function) = 1;
- }
-+ /* We can use scratch1 to save and restore the original value of
-+ PIC register except for SHcompact. */
-+ if (flag_pic && ! TARGET_SHCOMPACT)
-+ {
-+ emit_move_insn (scratch1,
-+ gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM));
-+ emit_insn (gen_GOTaddr2picreg ());
-+ }
- funexp = XEXP (DECL_RTL (function), 0);
- emit_move_insn (scratch2, funexp);
-+ if (flag_pic)
-+ {
-+ if (! TARGET_SHCOMPACT)
-+ emit_move_insn (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM),
-+ scratch1);
-+ else
-+ pop (PIC_OFFSET_TABLE_REGNUM);
-+ }
- funexp = gen_rtx_MEM (FUNCTION_MODE, scratch2);
- sibcall = emit_call_insn (gen_sibcall (funexp, const0_rtx, NULL_RTX));
- SIBLING_CALL_P (sibcall) = 1;
diff --git a/patches/gcc/3.4.6/200-all_sh-no-reorder-blocks.patch b/patches/gcc/3.4.6/200-all_sh-no-reorder-blocks.patch
deleted file mode 100644
index fed1424..0000000
--- a/patches/gcc/3.4.6/200-all_sh-no-reorder-blocks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/sh/sh.h gcc-3.4.6/gcc/config/sh/sh.h
---- gcc-3.4.6.orig/gcc/config/sh/sh.h 2006-01-12 02:20:32.000000000 +0100
-+++ gcc-3.4.6/gcc/config/sh/sh.h 2007-08-15 23:03:09.000000000 +0200
-@@ -422,6 +422,10 @@
- do { \
- if (LEVEL) \
- flag_omit_frame_pointer = -1; \
-+ if (LEVEL <= 2) \
-+ { \
-+ flag_reorder_blocks = 0; \
-+ } \
- if (SIZE) \
- target_flags |= SPACE_BIT; \
- if (TARGET_SHMEDIA && LEVEL > 1) \
diff --git a/patches/gcc/3.4.6/210-all_sh-pr20617.patch b/patches/gcc/3.4.6/210-all_sh-pr20617.patch
deleted file mode 100644
index 80d0d90..0000000
--- a/patches/gcc/3.4.6/210-all_sh-pr20617.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/sh/lib1funcs.asm gcc-3.4.6/gcc/config/sh/lib1funcs.asm
---- gcc-3.4.6.orig/gcc/config/sh/lib1funcs.asm 2003-08-12 03:25:07.000000000 +0200
-+++ gcc-3.4.6/gcc/config/sh/lib1funcs.asm 2007-08-15 23:04:26.000000000 +0200
-@@ -37,9 +37,19 @@
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-
-+#define ALIAS(X,Y) .global GLOBAL(X); .set GLOBAL(X),GLOBAL(Y)
-+
- #ifdef __ELF__
- #define LOCAL(X) .L_##X
--#define FUNC(X) .type X,@function
-+
-+#if 1 /* ??? The export list mechanism is broken, everything that is not
-+ hidden is exported. */
-+#undef FUNC
-+#define FUNC(X) .type X,@function; .hidden X
-+#undef ALIAS
-+#define ALIAS(X,Y) .global GLOBAL(X); .set GLOBAL(X),GLOBAL(Y); .hidden GLOBAL(X)
-+#endif
-+
- #define ENDFUNC0(X) .Lfe_##X: .size X,.Lfe_##X-X
- #define ENDFUNC(X) ENDFUNC0(X)
- #else
diff --git a/patches/gcc/3.4.6/220-arm-bigendian.patch b/patches/gcc/3.4.6/220-arm-bigendian.patch
deleted file mode 100644
index bb27636..0000000
--- a/patches/gcc/3.4.6/220-arm-bigendian.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/arm/linux-elf.h gcc-3.4.6/gcc/config/arm/linux-elf.h
---- gcc-3.4.6.orig/gcc/config/arm/linux-elf.h 2007-08-15 22:51:01.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/linux-elf.h 2007-08-15 23:05:42.000000000 +0200
-@@ -30,17 +30,34 @@
- /* Do not assume anything about header files. */
- #define NO_IMPLICIT_EXTERN_C
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT ARM_FLAG_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- /* Default is to use APCS-32 mode. */
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_APCS_32 | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT \
-+ ( ARM_FLAG_APCS_32 | \
-+ ARM_FLAG_MMU_TRAPS | \
-+ TARGET_ENDIAN_DEFAULT )
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mapcs-32", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mapcs-32", "mno-thumb-interwork" }
-
- #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
-
-@@ -94,7 +111,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
-diff -durN gcc-3.4.6.orig/gcc/config.gcc gcc-3.4.6/gcc/config.gcc
---- gcc-3.4.6.orig/gcc/config.gcc 2007-08-15 22:51:01.000000000 +0200
-+++ gcc-3.4.6/gcc/config.gcc 2007-08-15 23:05:42.000000000 +0200
-@@ -678,6 +678,11 @@
- ;;
- 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 arm/aout.h arm/arm.h"
-+ case $target in
-+ arm*b-*)
-+ tm_defines="TARGET_BIG_ENDIAN_DEFAULT=1 $tm_defines"
-+ ;;
-+ esac
- tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
- extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- gnu_ld=yes
diff --git a/patches/gcc/3.4.6/230-powerpc-libc_stack_end-uclibc.patch b/patches/gcc/3.4.6/230-powerpc-libc_stack_end-uclibc.patch
deleted file mode 100644
index 941974e..0000000
--- a/patches/gcc/3.4.6/230-powerpc-libc_stack_end-uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/rs6000/linux-unwind.h gcc-3.4.6/gcc/config/rs6000/linux-unwind.h
---- gcc-3.4.6.orig/gcc/config/rs6000/linux-unwind.h 2005-03-17 11:41:18.000000000 +0100
-+++ gcc-3.4.6/gcc/config/rs6000/linux-unwind.h 2007-08-15 23:07:00.000000000 +0200
-@@ -32,6 +32,7 @@
- these structs elsewhere; Many fields are missing, particularly
- from the end of the structures. */
-
-+#ifndef inhibit_libc
- struct gcc_vregs
- {
- __attribute__ ((vector_size (16))) int vr[32];
-@@ -320,3 +321,4 @@
- \
- goto SUCCESS; \
- } while (0)
-+#endif
diff --git a/patches/gcc/3.4.6/240-mips-xgot.patch b/patches/gcc/3.4.6/240-mips-xgot.patch
deleted file mode 100644
index e294670..0000000
--- a/patches/gcc/3.4.6/240-mips-xgot.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/mips/t-linux gcc-3.4.6/gcc/config/mips/t-linux
---- gcc-3.4.6.orig/gcc/config/mips/t-linux 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/mips/t-linux 2007-08-15 23:08:15.000000000 +0200
-@@ -0,0 +1,3 @@
-+# Compile crtbegin/end with xgot so it works for both
-+# normal and large GOTs.
-+CRTSTUFF_T_CFLAGS = -mxgot
diff --git a/patches/gcc/3.4.6/250-nios2.patch b/patches/gcc/3.4.6/250-nios2.patch
deleted file mode 100644
index 5f0cc14..0000000
--- a/patches/gcc/3.4.6/250-nios2.patch
+++ /dev/null
@@ -1,10231 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/combine.c gcc-3.4.6/gcc/combine.c
---- gcc-3.4.6.orig/gcc/combine.c 2005-08-08 20:41:04.000000000 +0200
-+++ gcc-3.4.6/gcc/combine.c 2007-08-15 23:09:36.000000000 +0200
-@@ -4381,6 +4381,14 @@
- mode);
- }
-
-+#ifndef __nios2__
-+/* This screws up Nios II in this test case:
-+
-+if (x & 1)
-+ return 2;
-+else
-+ return 3;
-+*/
- else if (STORE_FLAG_VALUE == 1
- && new_code == EQ && GET_MODE_CLASS (mode) == MODE_INT
- && op1 == const0_rtx
-@@ -4392,6 +4400,7 @@
- gen_lowpart_for_combine (mode, op0),
- const1_rtx);
- }
-+#endif
-
- else if (STORE_FLAG_VALUE == 1
- && new_code == EQ && GET_MODE_CLASS (mode) == MODE_INT
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/crti.asm gcc-3.4.6/gcc/config/nios2/crti.asm
---- gcc-3.4.6.orig/gcc/config/nios2/crti.asm 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/crti.asm 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,88 @@
-+/*
-+ Copyright (C) 2003
-+ by Jonah Graham (jgraham@altera.com)
-+
-+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.
-+
-+
-+This file just make a stack frame for the contents of the .fini and
-+.init sections. Users may put any desired instructions in those
-+sections.
-+
-+
-+While technically any code can be put in the init and fini sections
-+most stuff will not work other than stuff which obeys the call frame
-+and ABI. All the call-preserved registers are saved, the call clobbered
-+registers should have been saved by the code calling init and fini.
-+
-+See crtstuff.c for an example of code that inserts itself in the
-+init and fini sections.
-+
-+See crt0.s for the code that calls init and fini.
-+*/
-+
-+ .file "crti.asm"
-+
-+ .section ".init"
-+ .align 2
-+ .global _init
-+_init:
-+ addi sp, sp, -48
-+ stw ra, 44(sp)
-+ stw r23, 40(sp)
-+ stw r22, 36(sp)
-+ stw r21, 32(sp)
-+ stw r20, 28(sp)
-+ stw r19, 24(sp)
-+ stw r18, 20(sp)
-+ stw r17, 16(sp)
-+ stw r16, 12(sp)
-+ stw fp, 8(sp)
-+ mov fp, sp
-+
-+
-+ .section ".fini"
-+ .align 2
-+ .global _fini
-+_fini:
-+ addi sp, sp, -48
-+ stw ra, 44(sp)
-+ stw r23, 40(sp)
-+ stw r22, 36(sp)
-+ stw r21, 32(sp)
-+ stw r20, 28(sp)
-+ stw r19, 24(sp)
-+ stw r18, 20(sp)
-+ stw r17, 16(sp)
-+ stw r16, 12(sp)
-+ stw fp, 8(sp)
-+ mov fp, sp
-+
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/crtn.asm gcc-3.4.6/gcc/config/nios2/crtn.asm
---- gcc-3.4.6.orig/gcc/config/nios2/crtn.asm 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/crtn.asm 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,70 @@
-+/*
-+ Copyright (C) 2003
-+ by Jonah Graham (jgraham@altera.com)
-+
-+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.
-+
-+
-+This file just makes sure that the .fini and .init sections do in
-+fact return. Users may put any desired instructions in those sections.
-+This file is the last thing linked into any executable.
-+*/
-+ .file "crtn.asm"
-+
-+
-+
-+ .section ".init"
-+ ldw ra, 44(sp)
-+ ldw r23, 40(sp)
-+ ldw r22, 36(sp)
-+ ldw r21, 32(sp)
-+ ldw r20, 28(sp)
-+ ldw r19, 24(sp)
-+ ldw r18, 20(sp)
-+ ldw r17, 16(sp)
-+ ldw r16, 12(sp)
-+ ldw fp, 8(sp)
-+ addi sp, sp, -48
-+ ret
-+
-+ .section ".fini"
-+ ldw ra, 44(sp)
-+ ldw r23, 40(sp)
-+ ldw r22, 36(sp)
-+ ldw r21, 32(sp)
-+ ldw r20, 28(sp)
-+ ldw r19, 24(sp)
-+ ldw r18, 20(sp)
-+ ldw r17, 16(sp)
-+ ldw r16, 12(sp)
-+ ldw fp, 8(sp)
-+ addi sp, sp, -48
-+ ret
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/lib2-divmod.c gcc-3.4.6/gcc/config/nios2/lib2-divmod.c
---- gcc-3.4.6.orig/gcc/config/nios2/lib2-divmod.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/lib2-divmod.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,126 @@
-+
-+/* We include auto-host.h here to get HAVE_GAS_HIDDEN. This is
-+ supposedly valid even though this is a "target" file. */
-+#include "auto-host.h"
-+
-+
-+#include "tconfig.h"
-+#include "tsystem.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+
-+
-+/* Don't use `fancy_abort' here even if config.h says to use it. */
-+#ifdef abort
-+#undef abort
-+#endif
-+
-+
-+#ifdef HAVE_GAS_HIDDEN
-+#define ATTRIBUTE_HIDDEN __attribute__ ((__visibility__ ("hidden")))
-+#else
-+#define ATTRIBUTE_HIDDEN
-+#endif
-+
-+#include "libgcc2.h"
-+
-+extern SItype __modsi3 (SItype, SItype);
-+extern SItype __divsi3 (SItype, SItype);
-+extern SItype __umodsi3 (SItype, SItype);
-+extern SItype __udivsi3 (SItype, SItype);
-+
-+static USItype udivmodsi4(USItype, USItype, word_type);
-+
-+/* 16-bit SI divide and modulo as used in NIOS */
-+
-+
-+static USItype
-+udivmodsi4(USItype num, USItype den, word_type modwanted)
-+{
-+ USItype bit = 1;
-+ USItype res = 0;
-+
-+ while (den < num && bit && !(den & (1L<<31)))
-+ {
-+ den <<=1;
-+ bit <<=1;
-+ }
-+ while (bit)
-+ {
-+ if (num >= den)
-+ {
-+ num -= den;
-+ res |= bit;
-+ }
-+ bit >>=1;
-+ den >>=1;
-+ }
-+ if (modwanted) return num;
-+ return res;
-+}
-+
-+
-+SItype
-+__divsi3 (SItype a, SItype b)
-+{
-+ word_type neg = 0;
-+ SItype res;
-+
-+ if (a < 0)
-+ {
-+ a = -a;
-+ neg = !neg;
-+ }
-+
-+ if (b < 0)
-+ {
-+ b = -b;
-+ neg = !neg;
-+ }
-+
-+ res = udivmodsi4 (a, b, 0);
-+
-+ if (neg)
-+ res = -res;
-+
-+ return res;
-+}
-+
-+
-+SItype
-+__modsi3 (SItype a, SItype b)
-+{
-+ word_type neg = 0;
-+ SItype res;
-+
-+ if (a < 0)
-+ {
-+ a = -a;
-+ neg = 1;
-+ }
-+
-+ if (b < 0)
-+ b = -b;
-+
-+ res = udivmodsi4 (a, b, 1);
-+
-+ if (neg)
-+ res = -res;
-+
-+ return res;
-+}
-+
-+
-+SItype
-+__udivsi3 (SItype a, SItype b)
-+{
-+ return udivmodsi4 (a, b, 0);
-+}
-+
-+
-+SItype
-+__umodsi3 (SItype a, SItype b)
-+{
-+ return udivmodsi4 (a, b, 1);
-+}
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/lib2-divmod-hi.c gcc-3.4.6/gcc/config/nios2/lib2-divmod-hi.c
---- gcc-3.4.6.orig/gcc/config/nios2/lib2-divmod-hi.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/lib2-divmod-hi.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,123 @@
-+
-+/* We include auto-host.h here to get HAVE_GAS_HIDDEN. This is
-+ supposedly valid even though this is a "target" file. */
-+#include "auto-host.h"
-+
-+
-+#include "tconfig.h"
-+#include "tsystem.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+
-+
-+/* Don't use `fancy_abort' here even if config.h says to use it. */
-+#ifdef abort
-+#undef abort
-+#endif
-+
-+
-+#ifdef HAVE_GAS_HIDDEN
-+#define ATTRIBUTE_HIDDEN __attribute__ ((__visibility__ ("hidden")))
-+#else
-+#define ATTRIBUTE_HIDDEN
-+#endif
-+
-+#include "libgcc2.h"
-+
-+extern HItype __modhi3 (HItype, HItype);
-+extern HItype __divhi3 (HItype, HItype);
-+extern HItype __umodhi3 (HItype, HItype);
-+extern HItype __udivhi3 (HItype, HItype);
-+
-+static UHItype udivmodhi4(UHItype, UHItype, word_type);
-+
-+static UHItype
-+udivmodhi4(UHItype num, UHItype den, word_type modwanted)
-+{
-+ UHItype bit = 1;
-+ UHItype res = 0;
-+
-+ while (den < num && bit && !(den & (1L<<15)))
-+ {
-+ den <<=1;
-+ bit <<=1;
-+ }
-+ while (bit)
-+ {
-+ if (num >= den)
-+ {
-+ num -= den;
-+ res |= bit;
-+ }
-+ bit >>=1;
-+ den >>=1;
-+ }
-+ if (modwanted) return num;
-+ return res;
-+}
-+
-+
-+HItype
-+__divhi3 (HItype a, HItype b)
-+{
-+ word_type neg = 0;
-+ HItype res;
-+
-+ if (a < 0)
-+ {
-+ a = -a;
-+ neg = !neg;
-+ }
-+
-+ if (b < 0)
-+ {
-+ b = -b;
-+ neg = !neg;
-+ }
-+
-+ res = udivmodhi4 (a, b, 0);
-+
-+ if (neg)
-+ res = -res;
-+
-+ return res;
-+}
-+
-+
-+HItype
-+__modhi3 (HItype a, HItype b)
-+{
-+ word_type neg = 0;
-+ HItype res;
-+
-+ if (a < 0)
-+ {
-+ a = -a;
-+ neg = 1;
-+ }
-+
-+ if (b < 0)
-+ b = -b;
-+
-+ res = udivmodhi4 (a, b, 1);
-+
-+ if (neg)
-+ res = -res;
-+
-+ return res;
-+}
-+
-+
-+HItype
-+__udivhi3 (HItype a, HItype b)
-+{
-+ return udivmodhi4 (a, b, 0);
-+}
-+
-+
-+HItype
-+__umodhi3 (HItype a, HItype b)
-+{
-+ return udivmodhi4 (a, b, 1);
-+}
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/lib2-divtable.c gcc-3.4.6/gcc/config/nios2/lib2-divtable.c
---- gcc-3.4.6.orig/gcc/config/nios2/lib2-divtable.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/lib2-divtable.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,46 @@
-+
-+/* We include auto-host.h here to get HAVE_GAS_HIDDEN. This is
-+ supposedly valid even though this is a "target" file. */
-+#include "auto-host.h"
-+
-+
-+#include "tconfig.h"
-+#include "tsystem.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+
-+
-+/* Don't use `fancy_abort' here even if config.h says to use it. */
-+#ifdef abort
-+#undef abort
-+#endif
-+
-+
-+#ifdef HAVE_GAS_HIDDEN
-+#define ATTRIBUTE_HIDDEN __attribute__ ((__visibility__ ("hidden")))
-+#else
-+#define ATTRIBUTE_HIDDEN
-+#endif
-+
-+#include "libgcc2.h"
-+
-+UQItype __divsi3_table[] =
-+{
-+ 0, 0/1, 0/2, 0/3, 0/4, 0/5, 0/6, 0/7, 0/8, 0/9, 0/10, 0/11, 0/12, 0/13, 0/14, 0/15,
-+ 0, 1/1, 1/2, 1/3, 1/4, 1/5, 1/6, 1/7, 1/8, 1/9, 1/10, 1/11, 1/12, 1/13, 1/14, 1/15,
-+ 0, 2/1, 2/2, 2/3, 2/4, 2/5, 2/6, 2/7, 2/8, 2/9, 2/10, 2/11, 2/12, 2/13, 2/14, 2/15,
-+ 0, 3/1, 3/2, 3/3, 3/4, 3/5, 3/6, 3/7, 3/8, 3/9, 3/10, 3/11, 3/12, 3/13, 3/14, 3/15,
-+ 0, 4/1, 4/2, 4/3, 4/4, 4/5, 4/6, 4/7, 4/8, 4/9, 4/10, 4/11, 4/12, 4/13, 4/14, 4/15,
-+ 0, 5/1, 5/2, 5/3, 5/4, 5/5, 5/6, 5/7, 5/8, 5/9, 5/10, 5/11, 5/12, 5/13, 5/14, 5/15,
-+ 0, 6/1, 6/2, 6/3, 6/4, 6/5, 6/6, 6/7, 6/8, 6/9, 6/10, 6/11, 6/12, 6/13, 6/14, 6/15,
-+ 0, 7/1, 7/2, 7/3, 7/4, 7/5, 7/6, 7/7, 7/8, 7/9, 7/10, 7/11, 7/12, 7/13, 7/14, 7/15,
-+ 0, 8/1, 8/2, 8/3, 8/4, 8/5, 8/6, 8/7, 8/8, 8/9, 8/10, 8/11, 8/12, 8/13, 8/14, 8/15,
-+ 0, 9/1, 9/2, 9/3, 9/4, 9/5, 9/6, 9/7, 9/8, 9/9, 9/10, 9/11, 9/12, 9/13, 9/14, 9/15,
-+ 0, 10/1, 10/2, 10/3, 10/4, 10/5, 10/6, 10/7, 10/8, 10/9, 10/10, 10/11, 10/12, 10/13, 10/14, 10/15,
-+ 0, 11/1, 11/2, 11/3, 11/4, 11/5, 11/6, 11/7, 11/8, 11/9, 11/10, 11/11, 11/12, 11/13, 11/14, 11/15,
-+ 0, 12/1, 12/2, 12/3, 12/4, 12/5, 12/6, 12/7, 12/8, 12/9, 12/10, 12/11, 12/12, 12/13, 12/14, 12/15,
-+ 0, 13/1, 13/2, 13/3, 13/4, 13/5, 13/6, 13/7, 13/8, 13/9, 13/10, 13/11, 13/12, 13/13, 13/14, 13/15,
-+ 0, 14/1, 14/2, 14/3, 14/4, 14/5, 14/6, 14/7, 14/8, 14/9, 14/10, 14/11, 14/12, 14/13, 14/14, 14/15,
-+ 0, 15/1, 15/2, 15/3, 15/4, 15/5, 15/6, 15/7, 15/8, 15/9, 15/10, 15/11, 15/12, 15/13, 15/14, 15/15,
-+};
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/lib2-mul.c gcc-3.4.6/gcc/config/nios2/lib2-mul.c
---- gcc-3.4.6.orig/gcc/config/nios2/lib2-mul.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/lib2-mul.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,103 @@
-+/* while we are debugging (ie compile outside of gcc build)
-+ disable gcc specific headers */
-+#ifndef DEBUG_MULSI3
-+
-+
-+/* We include auto-host.h here to get HAVE_GAS_HIDDEN. This is
-+ supposedly valid even though this is a "target" file. */
-+#include "auto-host.h"
-+
-+
-+#include "tconfig.h"
-+#include "tsystem.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+
-+
-+/* Don't use `fancy_abort' here even if config.h says to use it. */
-+#ifdef abort
-+#undef abort
-+#endif
-+
-+
-+#ifdef HAVE_GAS_HIDDEN
-+#define ATTRIBUTE_HIDDEN __attribute__ ((__visibility__ ("hidden")))
-+#else
-+#define ATTRIBUTE_HIDDEN
-+#endif
-+
-+#include "libgcc2.h"
-+
-+#else
-+#define SItype int
-+#define USItype unsigned int
-+#endif
-+
-+
-+extern SItype __mulsi3 (SItype, SItype);
-+
-+SItype
-+__mulsi3 (SItype a, SItype b)
-+{
-+ SItype res = 0;
-+ USItype cnt = a;
-+
-+ while (cnt)
-+ {
-+ if (cnt & 1)
-+ {
-+ res += b;
-+ }
-+ b <<= 1;
-+ cnt >>= 1;
-+ }
-+
-+ return res;
-+}
-+/*
-+TODO: Choose best alternative implementation.
-+
-+SItype
-+__divsi3 (SItype a, SItype b)
-+{
-+ SItype res = 0;
-+ USItype cnt = 0;
-+
-+ while (cnt < 32)
-+ {
-+ if (a & (1L << cnt))
-+ {
-+ res += b;
-+ }
-+ b <<= 1;
-+ cnt++;
-+ }
-+
-+ return res;
-+}
-+*/
-+
-+
-+#ifdef DEBUG_MULSI3
-+
-+int
-+main ()
-+{
-+ int i, j;
-+ int error = 0;
-+
-+ for (i = -1000; i < 1000; i++)
-+ for (j = -1000; j < 1000; j++)
-+ {
-+ int expect = i * j;
-+ int actual = A__divsi3 (i, j);
-+ if (expect != actual)
-+ {
-+ printf ("error: %d * %d = %d not %d\n", i, j, expect, actual);
-+ error = 1;
-+ }
-+ }
-+
-+ return error;
-+}
-+#endif
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2.c gcc-3.4.6/gcc/config/nios2/nios2.c
---- gcc-3.4.6.orig/gcc/config/nios2/nios2.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,2853 @@
-+/* Subroutines for assembler code output for Altera NIOS 2G NIOS2 version.
-+ Copyright (C) 2003 Altera
-+ Contributed by Jonah Graham (jgraham@altera.com).
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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.
-+
-+GNU CC 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 CC; 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 "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+#include "rtl.h"
-+#include "tree.h"
-+#include "tm_p.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 "recog.h"
-+#include "expr.h"
-+#include "toplev.h"
-+#include "basic-block.h"
-+#include "function.h"
-+#include "ggc.h"
-+#include "reload.h"
-+#include "debug.h"
-+#include "optabs.h"
-+#include "target.h"
-+#include "target-def.h"
-+
-+/* local prototypes */
-+static bool nios2_rtx_costs (rtx, int, int, int *);
-+
-+static void nios2_asm_function_prologue (FILE *, HOST_WIDE_INT);
-+static int nios2_use_dfa_pipeline_interface (void);
-+static int nios2_issue_rate (void);
-+static struct machine_function *nios2_init_machine_status (void);
-+static bool nios2_in_small_data_p (tree);
-+static rtx save_reg (int, HOST_WIDE_INT, rtx);
-+static rtx restore_reg (int, HOST_WIDE_INT);
-+static unsigned int nios2_section_type_flags (tree, const char *, int);
-+static void nios2_init_builtins (void);
-+static rtx nios2_expand_builtin (tree, rtx, rtx, enum machine_mode, int);
-+static bool nios2_function_ok_for_sibcall (tree, tree);
-+static void nios2_encode_section_info (tree, rtx, int);
-+
-+/* Initialize the GCC target structure. */
-+#undef TARGET_ASM_FUNCTION_PROLOGUE
-+#define TARGET_ASM_FUNCTION_PROLOGUE nios2_asm_function_prologue
-+
-+#undef TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE
-+#define TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE \
-+ nios2_use_dfa_pipeline_interface
-+#undef TARGET_SCHED_ISSUE_RATE
-+#define TARGET_SCHED_ISSUE_RATE nios2_issue_rate
-+#undef TARGET_IN_SMALL_DATA_P
-+#define TARGET_IN_SMALL_DATA_P nios2_in_small_data_p
-+#undef TARGET_ENCODE_SECTION_INFO
-+#define TARGET_ENCODE_SECTION_INFO nios2_encode_section_info
-+#undef TARGET_SECTION_TYPE_FLAGS
-+#define TARGET_SECTION_TYPE_FLAGS nios2_section_type_flags
-+
-+#undef TARGET_INIT_BUILTINS
-+#define TARGET_INIT_BUILTINS nios2_init_builtins
-+#undef TARGET_EXPAND_BUILTIN
-+#define TARGET_EXPAND_BUILTIN nios2_expand_builtin
-+
-+#undef TARGET_FUNCTION_OK_FOR_SIBCALL
-+#define TARGET_FUNCTION_OK_FOR_SIBCALL nios2_function_ok_for_sibcall
-+
-+#undef TARGET_RTX_COSTS
-+#define TARGET_RTX_COSTS nios2_rtx_costs
-+
-+
-+struct gcc_target targetm = TARGET_INITIALIZER;
-+
-+
-+
-+/* Threshold for data being put into the small data/bss area, instead
-+ of the normal data area (references to the small data/bss area take
-+ 1 instruction, and use the global pointer, references to the normal
-+ data area takes 2 instructions). */
-+unsigned HOST_WIDE_INT nios2_section_threshold = NIOS2_DEFAULT_GVALUE;
-+
-+
-+/* Structure to be filled in by compute_frame_size with register
-+ save masks, and offsets for the current function. */
-+
-+struct nios2_frame_info
-+GTY (())
-+{
-+ long total_size; /* # bytes that the entire frame takes up */
-+ long var_size; /* # bytes that variables take up */
-+ long args_size; /* # bytes that outgoing arguments take up */
-+ int save_reg_size; /* # bytes needed to store gp regs */
-+ int save_reg_rounded; /* # bytes needed to store gp regs */
-+ long save_regs_offset; /* offset from new sp to store gp registers */
-+ int initialized; /* != 0 if frame size already calculated */
-+ int num_regs; /* number of gp registers saved */
-+};
-+
-+struct machine_function
-+GTY (())
-+{
-+
-+ /* Current frame information, calculated by compute_frame_size. */
-+ struct nios2_frame_info frame;
-+};
-+
-+
-+/***************************************
-+ * Section encodings
-+ ***************************************/
-+
-+
-+
-+
-+
-+/***************************************
-+ * Stack Layout and Calling Conventions
-+ ***************************************/
-+
-+
-+#define TOO_BIG_OFFSET(X) ((X) > ((1 << 15) - 1))
-+#define TEMP_REG_NUM 8
-+
-+static void
-+nios2_asm_function_prologue (FILE *file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
-+{
-+ if (flag_verbose_asm || flag_debug_asm)
-+ {
-+ compute_frame_size ();
-+ dump_frame_size (file);
-+ }
-+}
-+
-+static rtx
-+save_reg (int regno, HOST_WIDE_INT offset, rtx cfa_store_reg)
-+{
-+ rtx insn, stack_slot;
-+
-+ stack_slot = gen_rtx_PLUS (SImode,
-+ cfa_store_reg,
-+ GEN_INT (offset));
-+
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ gen_rtx_MEM (SImode, stack_slot),
-+ gen_rtx_REG (SImode, regno)));
-+
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+
-+ return insn;
-+}
-+
-+static rtx
-+restore_reg (int regno, HOST_WIDE_INT offset)
-+{
-+ rtx insn, stack_slot;
-+
-+ if (TOO_BIG_OFFSET (offset))
-+ {
-+ stack_slot = gen_rtx_REG (SImode, TEMP_REG_NUM);
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ stack_slot,
-+ GEN_INT (offset)));
-+
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ stack_slot,
-+ gen_rtx_PLUS (SImode,
-+ stack_slot,
-+ stack_pointer_rtx)));
-+ }
-+ else
-+ {
-+ stack_slot = gen_rtx_PLUS (SImode,
-+ stack_pointer_rtx,
-+ GEN_INT (offset));
-+ }
-+
-+ stack_slot = gen_rtx_MEM (SImode, stack_slot);
-+
-+ insn = emit_move_insn (gen_rtx_REG (SImode, regno), stack_slot);
-+
-+ return insn;
-+}
-+
-+
-+/* There are two possible paths for prologue expansion,
-+- the first is if the total frame size is < 2^15-1. In that
-+case all the immediates will fit into the 16-bit immediate
-+fields.
-+- the second is when the frame size is too big, in that
-+case an additional temporary register is used, first
-+as a cfa_temp to offset the sp, second as the cfa_store
-+register.
-+
-+See the comment above dwarf2out_frame_debug_expr in
-+dwarf2out.c for more explanation of the "rules."
-+
-+
-+Case 1:
-+Rule # Example Insn Effect
-+2 addi sp, sp, -total_frame_size cfa.reg=sp, cfa.offset=total_frame_size
-+ cfa_store.reg=sp, cfa_store.offset=total_frame_size
-+12 stw ra, offset(sp)
-+12 stw r16, offset(sp)
-+1 mov fp, sp
-+
-+Case 2:
-+Rule # Example Insn Effect
-+6 movi r8, total_frame_size cfa_temp.reg=r8, cfa_temp.offset=total_frame_size
-+2 sub sp, sp, r8 cfa.reg=sp, cfa.offset=total_frame_size
-+ cfa_store.reg=sp, cfa_store.offset=total_frame_size
-+5 add r8, r8, sp cfa_store.reg=r8, cfa_store.offset=0
-+12 stw ra, offset(r8)
-+12 stw r16, offset(r8)
-+1 mov fp, sp
-+
-+*/
-+
-+void
-+expand_prologue ()
-+{
-+ int i;
-+ HOST_WIDE_INT total_frame_size;
-+ int cfa_store_offset;
-+ rtx insn;
-+ rtx cfa_store_reg = 0;
-+
-+ total_frame_size = compute_frame_size ();
-+
-+ if (total_frame_size)
-+ {
-+
-+ if (TOO_BIG_OFFSET (total_frame_size))
-+ {
-+ /* cfa_temp and cfa_store_reg are the same register,
-+ cfa_store_reg overwrites cfa_temp */
-+ cfa_store_reg = gen_rtx_REG (SImode, TEMP_REG_NUM);
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ cfa_store_reg,
-+ GEN_INT (total_frame_size)));
-+
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+
-+
-+ insn = gen_rtx_SET (SImode,
-+ stack_pointer_rtx,
-+ gen_rtx_MINUS (SImode,
-+ stack_pointer_rtx,
-+ cfa_store_reg));
-+
-+ insn = emit_insn (insn);
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+
-+
-+ /* if there are no registers to save, I don't need to
-+ create a cfa_store */
-+ if (cfun->machine->frame.save_reg_size)
-+ {
-+ insn = gen_rtx_SET (SImode,
-+ cfa_store_reg,
-+ gen_rtx_PLUS (SImode,
-+ cfa_store_reg,
-+ stack_pointer_rtx));
-+
-+ insn = emit_insn (insn);
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+ }
-+
-+ cfa_store_offset
-+ = total_frame_size
-+ - (cfun->machine->frame.save_regs_offset
-+ + cfun->machine->frame.save_reg_rounded);
-+ }
-+ else
-+ {
-+ insn = gen_rtx_SET (SImode,
-+ stack_pointer_rtx,
-+ gen_rtx_PLUS (SImode,
-+ stack_pointer_rtx,
-+ GEN_INT (-total_frame_size)));
-+ insn = emit_insn (insn);
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+
-+ cfa_store_reg = stack_pointer_rtx;
-+ cfa_store_offset
-+ = cfun->machine->frame.save_regs_offset
-+ + cfun->machine->frame.save_reg_rounded;
-+ }
-+ }
-+
-+ if (MUST_SAVE_REGISTER (RA_REGNO))
-+ {
-+ cfa_store_offset -= 4;
-+ save_reg (RA_REGNO, cfa_store_offset, cfa_store_reg);
-+ }
-+ if (MUST_SAVE_REGISTER (FP_REGNO))
-+ {
-+ cfa_store_offset -= 4;
-+ save_reg (FP_REGNO, cfa_store_offset, cfa_store_reg);
-+ }
-+
-+ for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-+ {
-+ if (MUST_SAVE_REGISTER (i) && i != FP_REGNO && i != RA_REGNO)
-+ {
-+ cfa_store_offset -= 4;
-+ save_reg (i, cfa_store_offset, cfa_store_reg);
-+ }
-+ }
-+
-+ if (frame_pointer_needed)
-+ {
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ gen_rtx_REG (SImode, FP_REGNO),
-+ gen_rtx_REG (SImode, SP_REGNO)));
-+
-+ RTX_FRAME_RELATED_P (insn) = 1;
-+ }
-+
-+ /* If we are profiling, make sure no instructions are scheduled before
-+ the call to mcount. */
-+ if (current_function_profile)
-+ emit_insn (gen_blockage ());
-+}
-+
-+void
-+expand_epilogue (bool sibcall_p)
-+{
-+ rtx insn;
-+ int i;
-+ HOST_WIDE_INT total_frame_size;
-+ int register_store_offset;
-+
-+ total_frame_size = compute_frame_size ();
-+
-+ if (!sibcall_p && nios2_can_use_return_insn ())
-+ {
-+ insn = emit_jump_insn (gen_return ());
-+ return;
-+ }
-+
-+ emit_insn (gen_blockage ());
-+
-+ register_store_offset =
-+ cfun->machine->frame.save_regs_offset +
-+ cfun->machine->frame.save_reg_rounded;
-+
-+ if (MUST_SAVE_REGISTER (RA_REGNO))
-+ {
-+ register_store_offset -= 4;
-+ restore_reg (RA_REGNO, register_store_offset);
-+ }
-+
-+ if (MUST_SAVE_REGISTER (FP_REGNO))
-+ {
-+ register_store_offset -= 4;
-+ restore_reg (FP_REGNO, register_store_offset);
-+ }
-+
-+ for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-+ {
-+ if (MUST_SAVE_REGISTER (i) && i != FP_REGNO && i != RA_REGNO)
-+ {
-+ register_store_offset -= 4;
-+ restore_reg (i, register_store_offset);
-+ }
-+ }
-+
-+ if (total_frame_size)
-+ {
-+ rtx sp_adjust;
-+
-+ if (TOO_BIG_OFFSET (total_frame_size))
-+ {
-+ sp_adjust = gen_rtx_REG (SImode, TEMP_REG_NUM);
-+ insn = emit_insn (gen_rtx_SET (SImode,
-+ sp_adjust,
-+ GEN_INT (total_frame_size)));
-+
-+ }
-+ else
-+ {
-+ sp_adjust = GEN_INT (total_frame_size);
-+ }
-+
-+ insn = gen_rtx_SET (SImode,
-+ stack_pointer_rtx,
-+ gen_rtx_PLUS (SImode,
-+ stack_pointer_rtx,
-+ sp_adjust));
-+ insn = emit_insn (insn);
-+ }
-+
-+
-+ if (!sibcall_p)
-+ {
-+ insn = emit_jump_insn (gen_return_from_epilogue (gen_rtx (REG, Pmode,
-+ RA_REGNO)));
-+ }
-+}
-+
-+
-+bool
-+nios2_function_ok_for_sibcall (tree a ATTRIBUTE_UNUSED, tree b ATTRIBUTE_UNUSED)
-+{
-+ return true;
-+}
-+
-+
-+
-+
-+
-+/* ----------------------- *
-+ * Profiling
-+ * ----------------------- */
-+
-+void
-+function_profiler (FILE *file, int labelno)
-+{
-+ fprintf (file, "\t%s mcount begin, label: .LP%d\n",
-+ ASM_COMMENT_START, labelno);
-+ fprintf (file, "\tnextpc\tr8\n");
-+ fprintf (file, "\tmov\tr9, ra\n");
-+ fprintf (file, "\tmovhi\tr10, %%hiadj(.LP%d)\n", labelno);
-+ fprintf (file, "\taddi\tr10, r10, %%lo(.LP%d)\n", labelno);
-+ fprintf (file, "\tcall\tmcount\n");
-+ fprintf (file, "\tmov\tra, r9\n");
-+ fprintf (file, "\t%s mcount end\n", ASM_COMMENT_START);
-+}
-+
-+
-+/***************************************
-+ * Stack Layout
-+ ***************************************/
-+
-+
-+void
-+dump_frame_size (FILE *file)
-+{
-+ fprintf (file, "\t%s Current Frame Info\n", ASM_COMMENT_START);
-+
-+ fprintf (file, "\t%s total_size = %ld\n", ASM_COMMENT_START,
-+ cfun->machine->frame.total_size);
-+ fprintf (file, "\t%s var_size = %ld\n", ASM_COMMENT_START,
-+ cfun->machine->frame.var_size);
-+ fprintf (file, "\t%s args_size = %ld\n", ASM_COMMENT_START,
-+ cfun->machine->frame.args_size);
-+ fprintf (file, "\t%s save_reg_size = %d\n", ASM_COMMENT_START,
-+ cfun->machine->frame.save_reg_size);
-+ fprintf (file, "\t%s save_reg_rounded = %d\n", ASM_COMMENT_START,
-+ cfun->machine->frame.save_reg_rounded);
-+ fprintf (file, "\t%s initialized = %d\n", ASM_COMMENT_START,
-+ cfun->machine->frame.initialized);
-+ fprintf (file, "\t%s num_regs = %d\n", ASM_COMMENT_START,
-+ cfun->machine->frame.num_regs);
-+ fprintf (file, "\t%s save_regs_offset = %ld\n", ASM_COMMENT_START,
-+ cfun->machine->frame.save_regs_offset);
-+ fprintf (file, "\t%s current_function_is_leaf = %d\n", ASM_COMMENT_START,
-+ current_function_is_leaf);
-+ fprintf (file, "\t%s frame_pointer_needed = %d\n", ASM_COMMENT_START,
-+ frame_pointer_needed);
-+ fprintf (file, "\t%s pretend_args_size = %d\n", ASM_COMMENT_START,
-+ current_function_pretend_args_size);
-+
-+}
-+
-+
-+/* Return the bytes needed to compute the frame pointer from the current
-+ stack pointer.
-+*/
-+
-+HOST_WIDE_INT
-+compute_frame_size ()
-+{
-+ unsigned int regno;
-+ HOST_WIDE_INT var_size; /* # of var. bytes allocated */
-+ HOST_WIDE_INT total_size; /* # bytes that the entire frame takes up */
-+ HOST_WIDE_INT save_reg_size; /* # bytes needed to store callee save regs */
-+ HOST_WIDE_INT save_reg_rounded;
-+ /* # bytes needed to store callee save regs (rounded) */
-+ HOST_WIDE_INT out_args_size; /* # bytes needed for outgoing args */
-+
-+ save_reg_size = 0;
-+ var_size = STACK_ALIGN (get_frame_size ());
-+ out_args_size = STACK_ALIGN (current_function_outgoing_args_size);
-+
-+ total_size = var_size + out_args_size;
-+
-+ /* Calculate space needed for gp registers. */
-+ for (regno = 0; regno <= FIRST_PSEUDO_REGISTER; regno++)
-+ {
-+ if (MUST_SAVE_REGISTER (regno))
-+ {
-+ save_reg_size += 4;
-+ }
-+ }
-+
-+ save_reg_rounded = STACK_ALIGN (save_reg_size);
-+ total_size += save_reg_rounded;
-+
-+ total_size += STACK_ALIGN (current_function_pretend_args_size);
-+
-+ /* Save other computed information. */
-+ cfun->machine->frame.total_size = total_size;
-+ cfun->machine->frame.var_size = var_size;
-+ cfun->machine->frame.args_size = current_function_outgoing_args_size;
-+ cfun->machine->frame.save_reg_size = save_reg_size;
-+ cfun->machine->frame.save_reg_rounded = save_reg_rounded;
-+ cfun->machine->frame.initialized = reload_completed;
-+ cfun->machine->frame.num_regs = save_reg_size / UNITS_PER_WORD;
-+
-+ cfun->machine->frame.save_regs_offset
-+ = save_reg_rounded ? current_function_outgoing_args_size + var_size : 0;
-+
-+ return total_size;
-+}
-+
-+
-+int
-+nios2_initial_elimination_offset (int from, int to ATTRIBUTE_UNUSED)
-+{
-+ int offset;
-+
-+ /* Set OFFSET to the offset from the stack pointer. */
-+ switch (from)
-+ {
-+ case FRAME_POINTER_REGNUM:
-+ offset = 0;
-+ break;
-+
-+ case ARG_POINTER_REGNUM:
-+ compute_frame_size ();
-+ offset = cfun->machine->frame.total_size;
-+ offset -= current_function_pretend_args_size;
-+ break;
-+
-+ case RETURN_ADDRESS_POINTER_REGNUM:
-+ compute_frame_size ();
-+ /* since the return address is always the first of the
-+ saved registers, return the offset to the beginning
-+ of the saved registers block */
-+ offset = cfun->machine->frame.save_regs_offset;
-+ break;
-+
-+ default:
-+ abort ();
-+ }
-+
-+ return offset;
-+}
-+
-+/* Return nonzero if this function is known to have a null epilogue.
-+ This allows the optimizer to omit jumps to jumps if no stack
-+ was created. */
-+int
-+nios2_can_use_return_insn ()
-+{
-+ if (!reload_completed)
-+ return 0;
-+
-+ if (regs_ever_live[RA_REGNO] || current_function_profile)
-+ return 0;
-+
-+ if (cfun->machine->frame.initialized)
-+ return cfun->machine->frame.total_size == 0;
-+
-+ return compute_frame_size () == 0;
-+}
-+
-+
-+
-+
-+
-+/***************************************
-+ *
-+ ***************************************/
-+
-+const char *nios2_sys_nosys_string; /* for -msys=nosys */
-+const char *nios2_sys_lib_string; /* for -msys-lib= */
-+const char *nios2_sys_crt0_string; /* for -msys-crt0= */
-+
-+void
-+override_options ()
-+{
-+ /* Function to allocate machine-dependent function status. */
-+ init_machine_status = &nios2_init_machine_status;
-+
-+ nios2_section_threshold
-+ = g_switch_set ? g_switch_value : NIOS2_DEFAULT_GVALUE;
-+
-+ if (nios2_sys_nosys_string && *nios2_sys_nosys_string)
-+ {
-+ error ("invalid option '-msys=nosys%s'", nios2_sys_nosys_string);
-+ }
-+
-+ /* If we don't have mul, we don't have mulx either! */
-+ if (!TARGET_HAS_MUL && TARGET_HAS_MULX)
-+ {
-+ target_flags &= ~HAS_MULX_FLAG;
-+ }
-+
-+}
-+
-+void
-+optimization_options (int level, int size)
-+{
-+ if (level || size)
-+ {
-+ target_flags |= INLINE_MEMCPY_FLAG;
-+ }
-+
-+ if (level >= 3 && !size)
-+ {
-+ target_flags |= FAST_SW_DIV_FLAG;
-+ }
-+}
-+
-+/* Allocate a chunk of memory for per-function machine-dependent data. */
-+static struct machine_function *
-+nios2_init_machine_status ()
-+{
-+ return ((struct machine_function *)
-+ ggc_alloc_cleared (sizeof (struct machine_function)));
-+}
-+
-+
-+
-+/*****************
-+ * Describing Relative Costs of Operations
-+ *****************/
-+
-+/* Compute a (partial) cost for rtx X. Return true if the complete
-+ cost has been computed, and false if subexpressions should be
-+ scanned. In either case, *TOTAL contains the cost result. */
-+
-+
-+
-+static bool
-+nios2_rtx_costs (rtx x, int code, int outer_code ATTRIBUTE_UNUSED, int *total)
-+{
-+ switch (code)
-+ {
-+ case CONST_INT:
-+ if (INTVAL (x) == 0)
-+ {
-+ *total = COSTS_N_INSNS (0);
-+ return true;
-+ }
-+ else if (SMALL_INT (INTVAL (x))
-+ || SMALL_INT_UNSIGNED (INTVAL (x))
-+ || UPPER16_INT (INTVAL (x)))
-+ {
-+ *total = COSTS_N_INSNS (2);
-+ return true;
-+ }
-+ else
-+ {
-+ *total = COSTS_N_INSNS (4);
-+ return true;
-+ }
-+
-+ case LABEL_REF:
-+ case SYMBOL_REF:
-+ /* ??? gp relative stuff will fit in here */
-+ /* fall through */
-+ case CONST:
-+ case CONST_DOUBLE:
-+ {
-+ *total = COSTS_N_INSNS (4);
-+ return true;
-+ }
-+
-+ case MULT:
-+ {
-+ *total = COSTS_N_INSNS (1);
-+ return false;
-+ }
-+ case SIGN_EXTEND:
-+ {
-+ *total = COSTS_N_INSNS (3);
-+ return false;
-+ }
-+ case ZERO_EXTEND:
-+ {
-+ *total = COSTS_N_INSNS (1);
-+ return false;
-+ }
-+
-+ default:
-+ return false;
-+ }
-+}
-+
-+
-+/***************************************
-+ * INSTRUCTION SUPPORT
-+ *
-+ * These functions are used within the Machine Description to
-+ * handle common or complicated output and expansions from
-+ * instructions.
-+ ***************************************/
-+
-+int
-+nios2_emit_move_sequence (rtx *operands, enum machine_mode mode)
-+{
-+ rtx to = operands[0];
-+ rtx from = operands[1];
-+
-+ if (!register_operand (to, mode) && !reg_or_0_operand (from, mode))
-+ {
-+ if (no_new_pseudos)
-+ internal_error ("Trying to force_reg no_new_pseudos == 1");
-+ from = copy_to_mode_reg (mode, from);
-+ }
-+
-+ operands[0] = to;
-+ operands[1] = from;
-+ return 0;
-+}
-+
-+/* Divide Support */
-+
-+/*
-+ If -O3 is used, we want to output a table lookup for
-+ divides between small numbers (both num and den >= 0
-+ and < 0x10). The overhead of this method in the worse
-+ case is 40 bytes in the text section (10 insns) and
-+ 256 bytes in the data section. Additional divides do
-+ not incur additional penalties in the data section.
-+
-+ Code speed is improved for small divides by about 5x
-+ when using this method in the worse case (~9 cycles
-+ vs ~45). And in the worse case divides not within the
-+ table are penalized by about 10% (~5 cycles vs ~45).
-+ However in the typical case the penalty is not as bad
-+ because doing the long divide in only 45 cycles is
-+ quite optimistic.
-+
-+ ??? It would be nice to have some benchmarks other
-+ than Dhrystone to back this up.
-+
-+ This bit of expansion is to create this instruction
-+ sequence as rtl.
-+ or $8, $4, $5
-+ slli $9, $4, 4
-+ cmpgeui $3, $8, 16
-+ beq $3, $0, .L3
-+ or $10, $9, $5
-+ add $12, $11, divide_table
-+ ldbu $2, 0($12)
-+ br .L1
-+.L3:
-+ call slow_div
-+.L1:
-+# continue here with result in $2
-+
-+ ??? Ideally I would like the emit libcall block to contain
-+ all of this code, but I don't know how to do that. What it
-+ means is that if the divide can be eliminated, it may not
-+ completely disappear.
-+
-+ ??? The __divsi3_table label should ideally be moved out
-+ of this block and into a global. If it is placed into the
-+ sdata section we can save even more cycles by doing things
-+ gp relative.
-+*/
-+int
-+nios2_emit_expensive_div (rtx *operands, enum machine_mode mode)
-+{
-+ rtx or_result, shift_left_result;
-+ rtx lookup_value;
-+ rtx lab1, lab3;
-+ rtx insns;
-+ rtx libfunc;
-+ rtx final_result;
-+ rtx tmp;
-+
-+ /* it may look a little generic, but only SImode
-+ is supported for now */
-+ if (mode != SImode)
-+ abort ();
-+
-+ libfunc = sdiv_optab->handlers[(int) SImode].libfunc;
-+
-+
-+
-+ lab1 = gen_label_rtx ();
-+ lab3 = gen_label_rtx ();
-+
-+ or_result = expand_simple_binop (SImode, IOR,
-+ operands[1], operands[2],
-+ 0, 0, OPTAB_LIB_WIDEN);
-+
-+ emit_cmp_and_jump_insns (or_result, GEN_INT (15), GTU, 0,
-+ GET_MODE (or_result), 0, lab3);
-+ JUMP_LABEL (get_last_insn ()) = lab3;
-+
-+ shift_left_result = expand_simple_binop (SImode, ASHIFT,
-+ operands[1], GEN_INT (4),
-+ 0, 0, OPTAB_LIB_WIDEN);
-+
-+ lookup_value = expand_simple_binop (SImode, IOR,
-+ shift_left_result, operands[2],
-+ 0, 0, OPTAB_LIB_WIDEN);
-+
-+ convert_move (operands[0],
-+ gen_rtx (MEM, QImode,
-+ gen_rtx (PLUS, SImode,
-+ lookup_value,
-+ gen_rtx_SYMBOL_REF (SImode, "__divsi3_table"))),
-+ 1);
-+
-+
-+ tmp = emit_jump_insn (gen_jump (lab1));
-+ JUMP_LABEL (tmp) = lab1;
-+ emit_barrier ();
-+
-+ emit_label (lab3);
-+ LABEL_NUSES (lab3) = 1;
-+
-+ start_sequence ();
-+ final_result = emit_library_call_value (libfunc, NULL_RTX,
-+ LCT_CONST, SImode, 2,
-+ operands[1], SImode,
-+ operands[2], SImode);
-+
-+
-+ insns = get_insns ();
-+ end_sequence ();
-+ emit_libcall_block (insns, operands[0], final_result,
-+ gen_rtx (DIV, SImode, operands[1], operands[2]));
-+
-+ emit_label (lab1);
-+ LABEL_NUSES (lab1) = 1;
-+ return 1;
-+}
-+
-+/* Branches/Compares */
-+
-+/* the way of handling branches/compares
-+ in gcc is heavily borrowed from MIPS */
-+
-+enum internal_test
-+{
-+ ITEST_EQ,
-+ ITEST_NE,
-+ ITEST_GT,
-+ ITEST_GE,
-+ ITEST_LT,
-+ ITEST_LE,
-+ ITEST_GTU,
-+ ITEST_GEU,
-+ ITEST_LTU,
-+ ITEST_LEU,
-+ ITEST_MAX
-+};
-+
-+static enum internal_test map_test_to_internal_test (enum rtx_code);
-+
-+/* Cached operands, and operator to compare for use in set/branch/trap
-+ on condition codes. */
-+rtx branch_cmp[2];
-+enum cmp_type branch_type;
-+
-+/* Make normal rtx_code into something we can index from an array */
-+
-+static enum internal_test
-+map_test_to_internal_test (enum rtx_code test_code)
-+{
-+ enum internal_test test = ITEST_MAX;
-+
-+ switch (test_code)
-+ {
-+ case EQ:
-+ test = ITEST_EQ;
-+ break;
-+ case NE:
-+ test = ITEST_NE;
-+ break;
-+ case GT:
-+ test = ITEST_GT;
-+ break;
-+ case GE:
-+ test = ITEST_GE;
-+ break;
-+ case LT:
-+ test = ITEST_LT;
-+ break;
-+ case LE:
-+ test = ITEST_LE;
-+ break;
-+ case GTU:
-+ test = ITEST_GTU;
-+ break;
-+ case GEU:
-+ test = ITEST_GEU;
-+ break;
-+ case LTU:
-+ test = ITEST_LTU;
-+ break;
-+ case LEU:
-+ test = ITEST_LEU;
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ return test;
-+}
-+
-+/* Generate the code to compare (and possibly branch) two integer values
-+ TEST_CODE is the comparison code we are trying to emulate
-+ (or implement directly)
-+ RESULT is where to store the result of the comparison,
-+ or null to emit a branch
-+ CMP0 CMP1 are the two comparison operands
-+ DESTINATION is the destination of the branch, or null to only compare
-+ */
-+
-+void
-+gen_int_relational (enum rtx_code test_code, /* relational test (EQ, etc) */
-+ rtx result, /* result to store comp. or 0 if branch */
-+ rtx cmp0, /* first operand to compare */
-+ rtx cmp1, /* second operand to compare */
-+ rtx destination) /* destination of the branch, or 0 if compare */
-+{
-+ struct cmp_info
-+ {
-+ /* for register (or 0) compares */
-+ enum rtx_code test_code_reg; /* code to use in instruction (LT vs. LTU) */
-+ int reverse_regs; /* reverse registers in test */
-+
-+ /* for immediate compares */
-+ enum rtx_code test_code_const;
-+ /* code to use in instruction (LT vs. LTU) */
-+ int const_low; /* low bound of constant we can accept */
-+ int const_high; /* high bound of constant we can accept */
-+ int const_add; /* constant to add */
-+
-+ /* generic info */
-+ int unsignedp; /* != 0 for unsigned comparisons. */
-+ };
-+
-+ static const struct cmp_info info[(int) ITEST_MAX] = {
-+
-+ {EQ, 0, EQ, -32768, 32767, 0, 0}, /* EQ */
-+ {NE, 0, NE, -32768, 32767, 0, 0}, /* NE */
-+
-+ {LT, 1, GE, -32769, 32766, 1, 0}, /* GT */
-+ {GE, 0, GE, -32768, 32767, 0, 0}, /* GE */
-+ {LT, 0, LT, -32768, 32767, 0, 0}, /* LT */
-+ {GE, 1, LT, -32769, 32766, 1, 0}, /* LE */
-+
-+ {LTU, 1, GEU, 0, 65534, 1, 0}, /* GTU */
-+ {GEU, 0, GEU, 0, 65535, 0, 0}, /* GEU */
-+ {LTU, 0, LTU, 0, 65535, 0, 0}, /* LTU */
-+ {GEU, 1, LTU, 0, 65534, 1, 0}, /* LEU */
-+ };
-+
-+ enum internal_test test;
-+ enum machine_mode mode;
-+ const struct cmp_info *p_info;
-+ int branch_p;
-+
-+
-+
-+
-+ test = map_test_to_internal_test (test_code);
-+ if (test == ITEST_MAX)
-+ abort ();
-+
-+ p_info = &info[(int) test];
-+
-+ mode = GET_MODE (cmp0);
-+ if (mode == VOIDmode)
-+ mode = GET_MODE (cmp1);
-+
-+ branch_p = (destination != 0);
-+
-+ /* We can't, under any circumstances, have const_ints in cmp0
-+ ??? Actually we could have const0 */
-+ if (GET_CODE (cmp0) == CONST_INT)
-+ cmp0 = force_reg (mode, cmp0);
-+
-+ /* if the comparison is against an int not in legal range
-+ move it into a register */
-+ if (GET_CODE (cmp1) == CONST_INT)
-+ {
-+ HOST_WIDE_INT value = INTVAL (cmp1);
-+
-+ if (value < p_info->const_low || value > p_info->const_high)
-+ cmp1 = force_reg (mode, cmp1);
-+ }
-+
-+ /* Comparison to constants, may involve adding 1 to change a GT into GE.
-+ Comparison between two registers, may involve switching operands. */
-+ if (GET_CODE (cmp1) == CONST_INT)
-+ {
-+ if (p_info->const_add != 0)
-+ {
-+ HOST_WIDE_INT new = INTVAL (cmp1) + p_info->const_add;
-+
-+ /* If modification of cmp1 caused overflow,
-+ we would get the wrong answer if we follow the usual path;
-+ thus, x > 0xffffffffU would turn into x > 0U. */
-+ if ((p_info->unsignedp
-+ ? (unsigned HOST_WIDE_INT) new >
-+ (unsigned HOST_WIDE_INT) INTVAL (cmp1)
-+ : new > INTVAL (cmp1)) != (p_info->const_add > 0))
-+ {
-+ /* ??? This case can never happen with the current numbers,
-+ but I am paranoid and would rather an abort than
-+ a bug I will never find */
-+ abort ();
-+ }
-+ else
-+ cmp1 = GEN_INT (new);
-+ }
-+ }
-+
-+ else if (p_info->reverse_regs)
-+ {
-+ rtx temp = cmp0;
-+ cmp0 = cmp1;
-+ cmp1 = temp;
-+ }
-+
-+
-+
-+ if (branch_p)
-+ {
-+ if (register_operand (cmp0, mode) && register_operand (cmp1, mode))
-+ {
-+ rtx insn;
-+ rtx cond = gen_rtx (p_info->test_code_reg, mode, cmp0, cmp1);
-+ rtx label = gen_rtx_LABEL_REF (VOIDmode, destination);
-+
-+ insn = gen_rtx_SET (VOIDmode, pc_rtx,
-+ gen_rtx_IF_THEN_ELSE (VOIDmode,
-+ cond, label, pc_rtx));
-+ emit_jump_insn (insn);
-+ }
-+ else
-+ {
-+ rtx cond, label;
-+
-+ result = gen_reg_rtx (mode);
-+
-+ emit_move_insn (result,
-+ gen_rtx (p_info->test_code_const, mode, cmp0,
-+ cmp1));
-+
-+ cond = gen_rtx (NE, mode, result, const0_rtx);
-+ label = gen_rtx_LABEL_REF (VOIDmode, destination);
-+
-+ emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx,
-+ gen_rtx_IF_THEN_ELSE (VOIDmode,
-+ cond,
-+ label, pc_rtx)));
-+ }
-+ }
-+ else
-+ {
-+ if (register_operand (cmp0, mode) && register_operand (cmp1, mode))
-+ {
-+ emit_move_insn (result,
-+ gen_rtx (p_info->test_code_reg, mode, cmp0, cmp1));
-+ }
-+ else
-+ {
-+ emit_move_insn (result,
-+ gen_rtx (p_info->test_code_const, mode, cmp0,
-+ cmp1));
-+ }
-+ }
-+
-+}
-+
-+
-+/* ??? For now conditional moves are only supported
-+ when the mode of the operands being compared are
-+ the same as the ones being moved */
-+
-+void
-+gen_conditional_move (rtx *operands, enum machine_mode mode)
-+{
-+ rtx insn, cond;
-+ rtx cmp_reg = gen_reg_rtx (mode);
-+ enum rtx_code cmp_code = GET_CODE (operands[1]);
-+ enum rtx_code move_code = EQ;
-+
-+ /* emit a comparison if it is not "simple".
-+ Simple comparisons are X eq 0 and X ne 0 */
-+ if ((cmp_code == EQ || cmp_code == NE) && branch_cmp[1] == const0_rtx)
-+ {
-+ cmp_reg = branch_cmp[0];
-+ move_code = cmp_code;
-+ }
-+ else if ((cmp_code == EQ || cmp_code == NE) && branch_cmp[0] == const0_rtx)
-+ {
-+ cmp_reg = branch_cmp[1];
-+ move_code = cmp_code == EQ ? NE : EQ;
-+ }
-+ else
-+ gen_int_relational (cmp_code, cmp_reg, branch_cmp[0], branch_cmp[1],
-+ NULL_RTX);
-+
-+ cond = gen_rtx (move_code, VOIDmode, cmp_reg, CONST0_RTX (mode));
-+ insn = gen_rtx_SET (mode, operands[0],
-+ gen_rtx_IF_THEN_ELSE (mode,
-+ cond, operands[2], operands[3]));
-+ emit_insn (insn);
-+}
-+
-+/*******************
-+ * Addressing Modes
-+ *******************/
-+
-+int
-+nios2_legitimate_address (rtx operand, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int strict)
-+{
-+ int ret_val = 0;
-+
-+ switch (GET_CODE (operand))
-+ {
-+ /* direct. */
-+ case SYMBOL_REF:
-+ if (SYMBOL_REF_IN_NIOS2_SMALL_DATA_P (operand))
-+ {
-+ ret_val = 1;
-+ break;
-+ }
-+ /* else, fall through */
-+ case LABEL_REF:
-+ case CONST_INT:
-+ case CONST:
-+ case CONST_DOUBLE:
-+ /* ??? In here I need to add gp addressing */
-+ ret_val = 0;
-+
-+ break;
-+
-+ /* Register indirect. */
-+ case REG:
-+ ret_val = REG_OK_FOR_BASE_P2 (operand, strict);
-+ break;
-+
-+ /* Register indirect with displacement */
-+ case PLUS:
-+ {
-+ rtx op0 = XEXP (operand, 0);
-+ rtx op1 = XEXP (operand, 1);
-+
-+ if (REG_P (op0) && REG_P (op1))
-+ ret_val = 0;
-+ else if (REG_P (op0) && CONSTANT_P (op1))
-+ ret_val = REG_OK_FOR_BASE_P2 (op0, strict)
-+ && SMALL_INT (INTVAL (op1));
-+ else if (REG_P (op1) && CONSTANT_P (op0))
-+ ret_val = REG_OK_FOR_BASE_P2 (op1, strict)
-+ && SMALL_INT (INTVAL (op0));
-+ else
-+ ret_val = 0;
-+ }
-+ break;
-+
-+ default:
-+ ret_val = 0;
-+ break;
-+ }
-+
-+ return ret_val;
-+}
-+
-+/* Return true if EXP should be placed in the small data section. */
-+
-+static bool
-+nios2_in_small_data_p (tree exp)
-+{
-+ /* We want to merge strings, so we never consider them small data. */
-+ if (TREE_CODE (exp) == STRING_CST)
-+ return false;
-+
-+ if (TREE_CODE (exp) == VAR_DECL && DECL_SECTION_NAME (exp))
-+ {
-+ const char *section = TREE_STRING_POINTER (DECL_SECTION_NAME (exp));
-+ /* ??? these string names need moving into
-+ an array in some header file */
-+ if (nios2_section_threshold > 0
-+ && (strcmp (section, ".sbss") == 0
-+ || strncmp (section, ".sbss.", 6) == 0
-+ || strcmp (section, ".sdata") == 0
-+ || strncmp (section, ".sdata.", 7) == 0))
-+ return true;
-+ }
-+ else if (TREE_CODE (exp) == VAR_DECL)
-+ {
-+ HOST_WIDE_INT size = int_size_in_bytes (TREE_TYPE (exp));
-+
-+ /* If this is an incomplete type with size 0, then we can't put it
-+ in sdata because it might be too big when completed. */
-+ if (size > 0 && size <= nios2_section_threshold)
-+ return true;
-+ }
-+
-+ return false;
-+}
-+
-+static void
-+nios2_encode_section_info (tree decl, rtx rtl, int first)
-+{
-+
-+ rtx symbol;
-+ int flags;
-+
-+ default_encode_section_info (decl, rtl, first);
-+
-+ /* Careful not to prod global register variables. */
-+ if (GET_CODE (rtl) != MEM)
-+ return;
-+ symbol = XEXP (rtl, 0);
-+ if (GET_CODE (symbol) != SYMBOL_REF)
-+ return;
-+
-+ flags = SYMBOL_REF_FLAGS (symbol);
-+
-+ /* We don't want weak variables to be addressed with gp in case they end up with
-+ value 0 which is not within 2^15 of $gp */
-+ if (DECL_P (decl) && DECL_WEAK (decl))
-+ flags |= SYMBOL_FLAG_WEAK_DECL;
-+
-+ SYMBOL_REF_FLAGS (symbol) = flags;
-+}
-+
-+
-+static unsigned int
-+nios2_section_type_flags (tree decl, const char *name, int reloc)
-+{
-+ unsigned int flags;
-+
-+ flags = default_section_type_flags (decl, name, reloc);
-+
-+ /* ??? these string names need moving into an array in some header file */
-+ if (strcmp (name, ".sbss") == 0
-+ || strncmp (name, ".sbss.", 6) == 0
-+ || strcmp (name, ".sdata") == 0
-+ || strncmp (name, ".sdata.", 7) == 0)
-+ flags |= SECTION_SMALL;
-+
-+ return flags;
-+}
-+
-+
-+
-+
-+/*****************************************
-+ * Defining the Output Assembler Language
-+ *****************************************/
-+
-+/* -------------- *
-+ * Output of Data
-+ * -------------- */
-+
-+
-+/* -------------------------------- *
-+ * Output of Assembler Instructions
-+ * -------------------------------- */
-+
-+
-+/* print the operand OP to file stream
-+ FILE modified by LETTER. LETTER
-+ can be one of:
-+ i: print "i" if OP is an immediate, except 0
-+ o: print "io" if OP is volatile
-+
-+ z: for const0_rtx print $0 instead of 0
-+ H: for %hiadj
-+ L: for %lo
-+ U: for upper half of 32 bit value
-+ */
-+
-+void
-+nios2_print_operand (FILE *file, rtx op, int letter)
-+{
-+
-+ switch (letter)
-+ {
-+ case 'i':
-+ if (CONSTANT_P (op) && (op != const0_rtx))
-+ fprintf (file, "i");
-+ return;
-+
-+ case 'o':
-+ if (GET_CODE (op) == MEM
-+ && ((MEM_VOLATILE_P (op) && !TARGET_CACHE_VOLATILE)
-+ || TARGET_BYPASS_CACHE))
-+ fprintf (file, "io");
-+ return;
-+
-+ default:
-+ break;
-+ }
-+
-+ if (comparison_operator (op, VOIDmode))
-+ {
-+ if (letter == 0)
-+ {
-+ fprintf (file, "%s", GET_RTX_NAME (GET_CODE (op)));
-+ return;
-+ }
-+ }
-+
-+
-+ switch (GET_CODE (op))
-+ {
-+ case REG:
-+ if (letter == 0 || letter == 'z')
-+ {
-+ fprintf (file, "%s", reg_names[REGNO (op)]);
-+ return;
-+ }
-+
-+ case CONST_INT:
-+ if (INTVAL (op) == 0 && letter == 'z')
-+ {
-+ fprintf (file, "zero");
-+ return;
-+ }
-+ else if (letter == 'U')
-+ {
-+ HOST_WIDE_INT val = INTVAL (op);
-+ rtx new_op;
-+ val = (val / 65536) & 0xFFFF;
-+ new_op = GEN_INT (val);
-+ output_addr_const (file, new_op);
-+ return;
-+ }
-+
-+ /* else, fall through */
-+ case CONST:
-+ case LABEL_REF:
-+ case SYMBOL_REF:
-+ case CONST_DOUBLE:
-+ if (letter == 0 || letter == 'z')
-+ {
-+ output_addr_const (file, op);
-+ return;
-+ }
-+ else if (letter == 'H')
-+ {
-+ fprintf (file, "%%hiadj(");
-+ output_addr_const (file, op);
-+ fprintf (file, ")");
-+ return;
-+ }
-+ else if (letter == 'L')
-+ {
-+ fprintf (file, "%%lo(");
-+ output_addr_const (file, op);
-+ fprintf (file, ")");
-+ return;
-+ }
-+
-+
-+ case SUBREG:
-+ case MEM:
-+ if (letter == 0)
-+ {
-+ output_address (op);
-+ return;
-+ }
-+
-+ case CODE_LABEL:
-+ if (letter == 0)
-+ {
-+ output_addr_const (file, op);
-+ return;
-+ }
-+
-+ default:
-+ break;
-+ }
-+
-+ fprintf (stderr, "Missing way to print (%c) ", letter);
-+ debug_rtx (op);
-+ abort ();
-+}
-+
-+static int gprel_constant (rtx);
-+
-+static int
-+gprel_constant (rtx op)
-+{
-+ if (GET_CODE (op) == SYMBOL_REF
-+ && SYMBOL_REF_IN_NIOS2_SMALL_DATA_P (op))
-+ {
-+ return 1;
-+ }
-+ else if (GET_CODE (op) == CONST
-+ && GET_CODE (XEXP (op, 0)) == PLUS)
-+ {
-+ return gprel_constant (XEXP (XEXP (op, 0), 0));
-+ }
-+ else
-+ {
-+ return 0;
-+ }
-+}
-+
-+void
-+nios2_print_operand_address (FILE *file, rtx op)
-+{
-+ switch (GET_CODE (op))
-+ {
-+ case CONST:
-+ case CONST_INT:
-+ case LABEL_REF:
-+ case CONST_DOUBLE:
-+ case SYMBOL_REF:
-+ if (gprel_constant (op))
-+ {
-+ fprintf (file, "%%gprel(");
-+ output_addr_const (file, op);
-+ fprintf (file, ")(%s)", reg_names[GP_REGNO]);
-+ return;
-+ }
-+
-+ break;
-+
-+ case PLUS:
-+ {
-+ rtx op0 = XEXP (op, 0);
-+ rtx op1 = XEXP (op, 1);
-+
-+ if (REG_P (op0) && CONSTANT_P (op1))
-+ {
-+ output_addr_const (file, op1);
-+ fprintf (file, "(%s)", reg_names[REGNO (op0)]);
-+ return;
-+ }
-+ else if (REG_P (op1) && CONSTANT_P (op0))
-+ {
-+ output_addr_const (file, op0);
-+ fprintf (file, "(%s)", reg_names[REGNO (op1)]);
-+ return;
-+ }
-+ }
-+ break;
-+
-+ case REG:
-+ fprintf (file, "0(%s)", reg_names[REGNO (op)]);
-+ return;
-+
-+ case MEM:
-+ {
-+ rtx base = XEXP (op, 0);
-+ PRINT_OPERAND_ADDRESS (file, base);
-+ return;
-+ }
-+ default:
-+ break;
-+ }
-+
-+ fprintf (stderr, "Missing way to print address\n");
-+ debug_rtx (op);
-+ abort ();
-+}
-+
-+
-+
-+
-+
-+/****************************
-+ * Predicates
-+ ****************************/
-+
-+int
-+arith_operand (rtx op, enum machine_mode mode)
-+{
-+ if (GET_CODE (op) == CONST_INT && SMALL_INT (INTVAL (op)))
-+ return 1;
-+
-+ return register_operand (op, mode);
-+}
-+
-+int
-+uns_arith_operand (rtx op, enum machine_mode mode)
-+{
-+ if (GET_CODE (op) == CONST_INT && SMALL_INT_UNSIGNED (INTVAL (op)))
-+ return 1;
-+
-+ return register_operand (op, mode);
-+}
-+
-+int
-+logical_operand (rtx op, enum machine_mode mode)
-+{
-+ if (GET_CODE (op) == CONST_INT
-+ && (SMALL_INT_UNSIGNED (INTVAL (op)) || UPPER16_INT (INTVAL (op))))
-+ return 1;
-+
-+ return register_operand (op, mode);
-+}
-+
-+int
-+shift_operand (rtx op, enum machine_mode mode)
-+{
-+ if (GET_CODE (op) == CONST_INT && SHIFT_INT (INTVAL (op)))
-+ return 1;
-+
-+ return register_operand (op, mode);
-+}
-+
-+int
-+rdwrctl_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-+{
-+ return GET_CODE (op) == CONST_INT && RDWRCTL_INT (INTVAL (op));
-+}
-+
-+/* Return truth value of whether OP is a register or the constant 0. */
-+
-+int
-+reg_or_0_operand (rtx op, enum machine_mode mode)
-+{
-+ switch (GET_CODE (op))
-+ {
-+ case CONST_INT:
-+ return INTVAL (op) == 0;
-+
-+ case CONST_DOUBLE:
-+ return op == CONST0_RTX (mode);
-+
-+ default:
-+ break;
-+ }
-+
-+ return register_operand (op, mode);
-+}
-+
-+
-+int
-+equality_op (rtx op, enum machine_mode mode)
-+{
-+ if (mode != GET_MODE (op))
-+ return 0;
-+
-+ return GET_CODE (op) == EQ || GET_CODE (op) == NE;
-+}
-+
-+int
-+custom_insn_opcode (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-+{
-+ return GET_CODE (op) == CONST_INT && CUSTOM_INSN_OPCODE (INTVAL (op));
-+}
-+
-+
-+
-+
-+
-+
-+
-+/*****************************************************************************
-+**
-+** instruction scheduler
-+**
-+*****************************************************************************/
-+static int
-+nios2_use_dfa_pipeline_interface ()
-+{
-+ return 1;
-+}
-+
-+
-+static int
-+nios2_issue_rate ()
-+{
-+#ifdef MAX_DFA_ISSUE_RATE
-+ return MAX_DFA_ISSUE_RATE;
-+#else
-+ return 1;
-+#endif
-+}
-+
-+
-+const char *
-+asm_output_opcode (FILE *file ATTRIBUTE_UNUSED,
-+ const char *ptr ATTRIBUTE_UNUSED)
-+{
-+ const char *p;
-+
-+ p = ptr;
-+ return ptr;
-+}
-+
-+
-+
-+/*****************************************************************************
-+**
-+** function arguments
-+**
-+*****************************************************************************/
-+
-+void
-+init_cumulative_args (CUMULATIVE_ARGS *cum,
-+ tree fntype ATTRIBUTE_UNUSED,
-+ rtx libname ATTRIBUTE_UNUSED,
-+ tree fndecl ATTRIBUTE_UNUSED,
-+ int n_named_args ATTRIBUTE_UNUSED)
-+{
-+ cum->regs_used = 0;
-+}
-+
-+
-+/* Update the data in CUM to advance over an argument
-+ of mode MODE and data type TYPE.
-+ (TYPE is null for libcalls where that information may not be available.) */
-+
-+void
-+function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
-+ tree type ATTRIBUTE_UNUSED, int named ATTRIBUTE_UNUSED)
-+{
-+ HOST_WIDE_INT param_size;
-+
-+ if (mode == BLKmode)
-+ {
-+ param_size = int_size_in_bytes (type);
-+ if (param_size < 0)
-+ internal_error
-+ ("Do not know how to handle large structs or variable length types");
-+ }
-+ else
-+ {
-+ param_size = GET_MODE_SIZE (mode);
-+ }
-+
-+ /* convert to words (round up) */
-+ param_size = (3 + param_size) / 4;
-+
-+ if (cum->regs_used + param_size > NUM_ARG_REGS)
-+ {
-+ cum->regs_used = NUM_ARG_REGS;
-+ }
-+ else
-+ {
-+ cum->regs_used += param_size;
-+ }
-+
-+ return;
-+}
-+
-+/* Define where to put the arguments to a function. Value is zero to
-+ push the argument on the stack, or a hard register in which to
-+ store the argument.
-+
-+ MODE is the argument's machine mode.
-+ TYPE is the data type of the argument (as a tree).
-+ This is null for libcalls where that information may
-+ not be available.
-+ CUM is a variable of type CUMULATIVE_ARGS which gives info about
-+ the preceding args and about the function being called.
-+ NAMED is nonzero if this argument is a named parameter
-+ (otherwise it is an extra parameter matching an ellipsis). */
-+rtx
-+function_arg (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
-+ tree type ATTRIBUTE_UNUSED, int named ATTRIBUTE_UNUSED)
-+{
-+ rtx return_rtx = NULL_RTX;
-+
-+ if (cum->regs_used < NUM_ARG_REGS)
-+ {
-+ return_rtx = gen_rtx_REG (mode, FIRST_ARG_REGNO + cum->regs_used);
-+ }
-+
-+ return return_rtx;
-+}
-+
-+int
-+function_arg_partial_nregs (const CUMULATIVE_ARGS *cum,
-+ enum machine_mode mode, tree type,
-+ int named ATTRIBUTE_UNUSED)
-+{
-+ HOST_WIDE_INT param_size;
-+
-+ if (mode == BLKmode)
-+ {
-+ param_size = int_size_in_bytes (type);
-+ if (param_size < 0)
-+ internal_error
-+ ("Do not know how to handle large structs or variable length types");
-+ }
-+ else
-+ {
-+ param_size = GET_MODE_SIZE (mode);
-+ }
-+
-+ /* convert to words (round up) */
-+ param_size = (3 + param_size) / 4;
-+
-+ if (cum->regs_used < NUM_ARG_REGS
-+ && cum->regs_used + param_size > NUM_ARG_REGS)
-+ {
-+ return NUM_ARG_REGS - cum->regs_used;
-+ }
-+ else
-+ {
-+ return 0;
-+ }
-+}
-+
-+
-+int
-+nios2_return_in_memory (tree type)
-+{
-+ int res = ((int_size_in_bytes (type) > (2 * UNITS_PER_WORD))
-+ || (int_size_in_bytes (type) == -1));
-+
-+ return res;
-+}
-+
-+/* ??? It may be possible to eliminate the copyback and implement
-+ my own va_arg type, but that is more work for now. */
-+int
-+nios2_setup_incoming_varargs (const CUMULATIVE_ARGS *cum,
-+ enum machine_mode mode, tree type,
-+ int no_rtl)
-+{
-+ CUMULATIVE_ARGS local_cum;
-+ int regs_to_push;
-+
-+ local_cum = *cum;
-+ FUNCTION_ARG_ADVANCE (local_cum, mode, type, 1);
-+
-+ regs_to_push = NUM_ARG_REGS - local_cum.regs_used;
-+
-+ if (!no_rtl)
-+ {
-+ if (regs_to_push > 0)
-+ {
-+ rtx ptr, mem;
-+
-+ ptr = virtual_incoming_args_rtx;
-+ mem = gen_rtx_MEM (BLKmode, ptr);
-+
-+ /* va_arg is an array access in this case, which causes
-+ it to get MEM_IN_STRUCT_P set. We must set it here
-+ so that the insn scheduler won't assume that these
-+ stores can't possibly overlap with the va_arg loads. */
-+ MEM_SET_IN_STRUCT_P (mem, 1);
-+
-+ emit_insn (gen_blockage ());
-+ move_block_from_reg (local_cum.regs_used + FIRST_ARG_REGNO, mem,
-+ regs_to_push);
-+ emit_insn (gen_blockage ());
-+ }
-+ }
-+
-+ return regs_to_push * UNITS_PER_WORD;
-+
-+}
-+
-+
-+
-+/*****************************************************************************
-+**
-+** builtins
-+**
-+** This method for handling builtins is from CSP where _many_ more types of
-+** expanders have already been written. Check there first before writing
-+** new ones.
-+**
-+*****************************************************************************/
-+
-+enum nios2_builtins
-+{
-+ NIOS2_BUILTIN_LDBIO,
-+ NIOS2_BUILTIN_LDBUIO,
-+ NIOS2_BUILTIN_LDHIO,
-+ NIOS2_BUILTIN_LDHUIO,
-+ NIOS2_BUILTIN_LDWIO,
-+ NIOS2_BUILTIN_STBIO,
-+ NIOS2_BUILTIN_STHIO,
-+ NIOS2_BUILTIN_STWIO,
-+ NIOS2_BUILTIN_SYNC,
-+ NIOS2_BUILTIN_RDCTL,
-+ NIOS2_BUILTIN_WRCTL,
-+
-+ NIOS2_BUILTIN_CUSTOM_N,
-+ NIOS2_BUILTIN_CUSTOM_NI,
-+ NIOS2_BUILTIN_CUSTOM_NF,
-+ NIOS2_BUILTIN_CUSTOM_NP,
-+ NIOS2_BUILTIN_CUSTOM_NII,
-+ NIOS2_BUILTIN_CUSTOM_NIF,
-+ NIOS2_BUILTIN_CUSTOM_NIP,
-+ NIOS2_BUILTIN_CUSTOM_NFI,
-+ NIOS2_BUILTIN_CUSTOM_NFF,
-+ NIOS2_BUILTIN_CUSTOM_NFP,
-+ NIOS2_BUILTIN_CUSTOM_NPI,
-+ NIOS2_BUILTIN_CUSTOM_NPF,
-+ NIOS2_BUILTIN_CUSTOM_NPP,
-+ NIOS2_BUILTIN_CUSTOM_IN,
-+ NIOS2_BUILTIN_CUSTOM_INI,
-+ NIOS2_BUILTIN_CUSTOM_INF,
-+ NIOS2_BUILTIN_CUSTOM_INP,
-+ NIOS2_BUILTIN_CUSTOM_INII,
-+ NIOS2_BUILTIN_CUSTOM_INIF,
-+ NIOS2_BUILTIN_CUSTOM_INIP,
-+ NIOS2_BUILTIN_CUSTOM_INFI,
-+ NIOS2_BUILTIN_CUSTOM_INFF,
-+ NIOS2_BUILTIN_CUSTOM_INFP,
-+ NIOS2_BUILTIN_CUSTOM_INPI,
-+ NIOS2_BUILTIN_CUSTOM_INPF,
-+ NIOS2_BUILTIN_CUSTOM_INPP,
-+ NIOS2_BUILTIN_CUSTOM_FN,
-+ NIOS2_BUILTIN_CUSTOM_FNI,
-+ NIOS2_BUILTIN_CUSTOM_FNF,
-+ NIOS2_BUILTIN_CUSTOM_FNP,
-+ NIOS2_BUILTIN_CUSTOM_FNII,
-+ NIOS2_BUILTIN_CUSTOM_FNIF,
-+ NIOS2_BUILTIN_CUSTOM_FNIP,
-+ NIOS2_BUILTIN_CUSTOM_FNFI,
-+ NIOS2_BUILTIN_CUSTOM_FNFF,
-+ NIOS2_BUILTIN_CUSTOM_FNFP,
-+ NIOS2_BUILTIN_CUSTOM_FNPI,
-+ NIOS2_BUILTIN_CUSTOM_FNPF,
-+ NIOS2_BUILTIN_CUSTOM_FNPP,
-+ NIOS2_BUILTIN_CUSTOM_PN,
-+ NIOS2_BUILTIN_CUSTOM_PNI,
-+ NIOS2_BUILTIN_CUSTOM_PNF,
-+ NIOS2_BUILTIN_CUSTOM_PNP,
-+ NIOS2_BUILTIN_CUSTOM_PNII,
-+ NIOS2_BUILTIN_CUSTOM_PNIF,
-+ NIOS2_BUILTIN_CUSTOM_PNIP,
-+ NIOS2_BUILTIN_CUSTOM_PNFI,
-+ NIOS2_BUILTIN_CUSTOM_PNFF,
-+ NIOS2_BUILTIN_CUSTOM_PNFP,
-+ NIOS2_BUILTIN_CUSTOM_PNPI,
-+ NIOS2_BUILTIN_CUSTOM_PNPF,
-+ NIOS2_BUILTIN_CUSTOM_PNPP,
-+
-+
-+ LIM_NIOS2_BUILTINS
-+};
-+
-+struct builtin_description
-+{
-+ const enum insn_code icode;
-+ const char *const name;
-+ const enum nios2_builtins code;
-+ const tree *type;
-+ rtx (* expander) PARAMS ((const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int));
-+};
-+
-+static rtx nios2_expand_STXIO (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_LDXIO (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_sync (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_rdctl (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_wrctl (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+
-+static rtx nios2_expand_custom_n (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_custom_Xn (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_custom_nX (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_custom_XnX (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_custom_nXX (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+static rtx nios2_expand_custom_XnXX (const struct builtin_description *,
-+ tree, rtx, rtx, enum machine_mode, int);
-+
-+static tree endlink;
-+
-+/* int fn (volatile const void *)
-+ */
-+static tree int_ftype_volatile_const_void_p;
-+
-+/* int fn (int)
-+ */
-+static tree int_ftype_int;
-+
-+/* void fn (int, int)
-+ */
-+static tree void_ftype_int_int;
-+
-+/* void fn (volatile void *, int)
-+ */
-+static tree void_ftype_volatile_void_p_int;
-+
-+/* void fn (void)
-+ */
-+static tree void_ftype_void;
-+
-+static tree custom_n;
-+static tree custom_ni;
-+static tree custom_nf;
-+static tree custom_np;
-+static tree custom_nii;
-+static tree custom_nif;
-+static tree custom_nip;
-+static tree custom_nfi;
-+static tree custom_nff;
-+static tree custom_nfp;
-+static tree custom_npi;
-+static tree custom_npf;
-+static tree custom_npp;
-+static tree custom_in;
-+static tree custom_ini;
-+static tree custom_inf;
-+static tree custom_inp;
-+static tree custom_inii;
-+static tree custom_inif;
-+static tree custom_inip;
-+static tree custom_infi;
-+static tree custom_inff;
-+static tree custom_infp;
-+static tree custom_inpi;
-+static tree custom_inpf;
-+static tree custom_inpp;
-+static tree custom_fn;
-+static tree custom_fni;
-+static tree custom_fnf;
-+static tree custom_fnp;
-+static tree custom_fnii;
-+static tree custom_fnif;
-+static tree custom_fnip;
-+static tree custom_fnfi;
-+static tree custom_fnff;
-+static tree custom_fnfp;
-+static tree custom_fnpi;
-+static tree custom_fnpf;
-+static tree custom_fnpp;
-+static tree custom_pn;
-+static tree custom_pni;
-+static tree custom_pnf;
-+static tree custom_pnp;
-+static tree custom_pnii;
-+static tree custom_pnif;
-+static tree custom_pnip;
-+static tree custom_pnfi;
-+static tree custom_pnff;
-+static tree custom_pnfp;
-+static tree custom_pnpi;
-+static tree custom_pnpf;
-+static tree custom_pnpp;
-+
-+
-+static const struct builtin_description bdesc[] = {
-+ {CODE_FOR_ldbio, "__builtin_ldbio", NIOS2_BUILTIN_LDBIO, &int_ftype_volatile_const_void_p, nios2_expand_LDXIO},
-+ {CODE_FOR_ldbuio, "__builtin_ldbuio", NIOS2_BUILTIN_LDBUIO, &int_ftype_volatile_const_void_p, nios2_expand_LDXIO},
-+ {CODE_FOR_ldhio, "__builtin_ldhio", NIOS2_BUILTIN_LDHIO, &int_ftype_volatile_const_void_p, nios2_expand_LDXIO},
-+ {CODE_FOR_ldhuio, "__builtin_ldhuio", NIOS2_BUILTIN_LDHUIO, &int_ftype_volatile_const_void_p, nios2_expand_LDXIO},
-+ {CODE_FOR_ldwio, "__builtin_ldwio", NIOS2_BUILTIN_LDWIO, &int_ftype_volatile_const_void_p, nios2_expand_LDXIO},
-+
-+ {CODE_FOR_stbio, "__builtin_stbio", NIOS2_BUILTIN_STBIO, &void_ftype_volatile_void_p_int, nios2_expand_STXIO},
-+ {CODE_FOR_sthio, "__builtin_sthio", NIOS2_BUILTIN_STHIO, &void_ftype_volatile_void_p_int, nios2_expand_STXIO},
-+ {CODE_FOR_stwio, "__builtin_stwio", NIOS2_BUILTIN_STWIO, &void_ftype_volatile_void_p_int, nios2_expand_STXIO},
-+
-+ {CODE_FOR_sync, "__builtin_sync", NIOS2_BUILTIN_SYNC, &void_ftype_void, nios2_expand_sync},
-+ {CODE_FOR_rdctl, "__builtin_rdctl", NIOS2_BUILTIN_RDCTL, &int_ftype_int, nios2_expand_rdctl},
-+ {CODE_FOR_wrctl, "__builtin_wrctl", NIOS2_BUILTIN_WRCTL, &void_ftype_int_int, nios2_expand_wrctl},
-+
-+ {CODE_FOR_custom_n, "__builtin_custom_n", NIOS2_BUILTIN_CUSTOM_N, &custom_n, nios2_expand_custom_n},
-+ {CODE_FOR_custom_ni, "__builtin_custom_ni", NIOS2_BUILTIN_CUSTOM_NI, &custom_ni, nios2_expand_custom_nX},
-+ {CODE_FOR_custom_nf, "__builtin_custom_nf", NIOS2_BUILTIN_CUSTOM_NF, &custom_nf, nios2_expand_custom_nX},
-+ {CODE_FOR_custom_np, "__builtin_custom_np", NIOS2_BUILTIN_CUSTOM_NP, &custom_np, nios2_expand_custom_nX},
-+ {CODE_FOR_custom_nii, "__builtin_custom_nii", NIOS2_BUILTIN_CUSTOM_NII, &custom_nii, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_nif, "__builtin_custom_nif", NIOS2_BUILTIN_CUSTOM_NIF, &custom_nif, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_nip, "__builtin_custom_nip", NIOS2_BUILTIN_CUSTOM_NIP, &custom_nip, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_nfi, "__builtin_custom_nfi", NIOS2_BUILTIN_CUSTOM_NFI, &custom_nfi, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_nff, "__builtin_custom_nff", NIOS2_BUILTIN_CUSTOM_NFF, &custom_nff, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_nfp, "__builtin_custom_nfp", NIOS2_BUILTIN_CUSTOM_NFP, &custom_nfp, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_npi, "__builtin_custom_npi", NIOS2_BUILTIN_CUSTOM_NPI, &custom_npi, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_npf, "__builtin_custom_npf", NIOS2_BUILTIN_CUSTOM_NPF, &custom_npf, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_npp, "__builtin_custom_npp", NIOS2_BUILTIN_CUSTOM_NPP, &custom_npp, nios2_expand_custom_nXX},
-+ {CODE_FOR_custom_in, "__builtin_custom_in", NIOS2_BUILTIN_CUSTOM_IN, &custom_in, nios2_expand_custom_Xn},
-+ {CODE_FOR_custom_ini, "__builtin_custom_ini", NIOS2_BUILTIN_CUSTOM_INI, &custom_ini, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_inf, "__builtin_custom_inf", NIOS2_BUILTIN_CUSTOM_INF, &custom_inf, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_inp, "__builtin_custom_inp", NIOS2_BUILTIN_CUSTOM_INP, &custom_inp, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_inii, "__builtin_custom_inii", NIOS2_BUILTIN_CUSTOM_INII, &custom_inii, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inif, "__builtin_custom_inif", NIOS2_BUILTIN_CUSTOM_INIF, &custom_inif, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inip, "__builtin_custom_inip", NIOS2_BUILTIN_CUSTOM_INIP, &custom_inip, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_infi, "__builtin_custom_infi", NIOS2_BUILTIN_CUSTOM_INFI, &custom_infi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inff, "__builtin_custom_inff", NIOS2_BUILTIN_CUSTOM_INFF, &custom_inff, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_infp, "__builtin_custom_infp", NIOS2_BUILTIN_CUSTOM_INFP, &custom_infp, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inpi, "__builtin_custom_inpi", NIOS2_BUILTIN_CUSTOM_INPI, &custom_inpi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inpf, "__builtin_custom_inpf", NIOS2_BUILTIN_CUSTOM_INPF, &custom_inpf, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_inpp, "__builtin_custom_inpp", NIOS2_BUILTIN_CUSTOM_INPP, &custom_inpp, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fn, "__builtin_custom_fn", NIOS2_BUILTIN_CUSTOM_FN, &custom_fn, nios2_expand_custom_Xn},
-+ {CODE_FOR_custom_fni, "__builtin_custom_fni", NIOS2_BUILTIN_CUSTOM_FNI, &custom_fni, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_fnf, "__builtin_custom_fnf", NIOS2_BUILTIN_CUSTOM_FNF, &custom_fnf, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_fnp, "__builtin_custom_fnp", NIOS2_BUILTIN_CUSTOM_FNP, &custom_fnp, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_fnii, "__builtin_custom_fnii", NIOS2_BUILTIN_CUSTOM_FNII, &custom_fnii, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnif, "__builtin_custom_fnif", NIOS2_BUILTIN_CUSTOM_FNIF, &custom_fnif, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnip, "__builtin_custom_fnip", NIOS2_BUILTIN_CUSTOM_FNIP, &custom_fnip, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnfi, "__builtin_custom_fnfi", NIOS2_BUILTIN_CUSTOM_FNFI, &custom_fnfi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnff, "__builtin_custom_fnff", NIOS2_BUILTIN_CUSTOM_FNFF, &custom_fnff, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnfp, "__builtin_custom_fnfp", NIOS2_BUILTIN_CUSTOM_FNFP, &custom_fnfp, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnpi, "__builtin_custom_fnpi", NIOS2_BUILTIN_CUSTOM_FNPI, &custom_fnpi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnpf, "__builtin_custom_fnpf", NIOS2_BUILTIN_CUSTOM_FNPF, &custom_fnpf, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_fnpp, "__builtin_custom_fnpp", NIOS2_BUILTIN_CUSTOM_FNPP, &custom_fnpp, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pn, "__builtin_custom_pn", NIOS2_BUILTIN_CUSTOM_PN, &custom_pn, nios2_expand_custom_Xn},
-+ {CODE_FOR_custom_pni, "__builtin_custom_pni", NIOS2_BUILTIN_CUSTOM_PNI, &custom_pni, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_pnf, "__builtin_custom_pnf", NIOS2_BUILTIN_CUSTOM_PNF, &custom_pnf, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_pnp, "__builtin_custom_pnp", NIOS2_BUILTIN_CUSTOM_PNP, &custom_pnp, nios2_expand_custom_XnX},
-+ {CODE_FOR_custom_pnii, "__builtin_custom_pnii", NIOS2_BUILTIN_CUSTOM_PNII, &custom_pnii, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnif, "__builtin_custom_pnif", NIOS2_BUILTIN_CUSTOM_PNIF, &custom_pnif, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnip, "__builtin_custom_pnip", NIOS2_BUILTIN_CUSTOM_PNIP, &custom_pnip, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnfi, "__builtin_custom_pnfi", NIOS2_BUILTIN_CUSTOM_PNFI, &custom_pnfi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnff, "__builtin_custom_pnff", NIOS2_BUILTIN_CUSTOM_PNFF, &custom_pnff, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnfp, "__builtin_custom_pnfp", NIOS2_BUILTIN_CUSTOM_PNFP, &custom_pnfp, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnpi, "__builtin_custom_pnpi", NIOS2_BUILTIN_CUSTOM_PNPI, &custom_pnpi, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnpf, "__builtin_custom_pnpf", NIOS2_BUILTIN_CUSTOM_PNPF, &custom_pnpf, nios2_expand_custom_XnXX},
-+ {CODE_FOR_custom_pnpp, "__builtin_custom_pnpp", NIOS2_BUILTIN_CUSTOM_PNPP, &custom_pnpp, nios2_expand_custom_XnXX},
-+
-+
-+ {0, 0, 0, 0, 0},
-+};
-+
-+/* This does not have a closing bracket on purpose (see use) */
-+#define def_param(TYPE) \
-+ tree_cons (NULL_TREE, TYPE,
-+
-+static void
-+nios2_init_builtins ()
-+{
-+ const struct builtin_description *d;
-+
-+
-+ endlink = void_list_node;
-+
-+ /* Special indenting here because one of the brackets is in def_param */
-+ /* *INDENT-OFF* */
-+
-+ /* int fn (volatile const void *)
-+ */
-+ int_ftype_volatile_const_void_p
-+ = build_function_type (integer_type_node,
-+ def_param (build_qualified_type (ptr_type_node,
-+ TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE))
-+ endlink));
-+
-+
-+ /* void fn (volatile void *, int)
-+ */
-+ void_ftype_volatile_void_p_int
-+ = build_function_type (void_type_node,
-+ def_param (build_qualified_type (ptr_type_node,
-+ TYPE_QUAL_VOLATILE))
-+ def_param (integer_type_node)
-+ endlink)));
-+
-+ /* void fn (void)
-+ */
-+ void_ftype_void
-+ = build_function_type (void_type_node,
-+ endlink);
-+
-+ /* int fn (int)
-+ */
-+ int_ftype_int
-+ = build_function_type (integer_type_node,
-+ def_param (integer_type_node)
-+ endlink));
-+
-+ /* void fn (int, int)
-+ */
-+ void_ftype_int_int
-+ = build_function_type (void_type_node,
-+ def_param (integer_type_node)
-+ def_param (integer_type_node)
-+ endlink)));
-+
-+
-+#define CUSTOM_NUM def_param (integer_type_node)
-+
-+ custom_n
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ endlink));
-+ custom_ni
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ endlink)));
-+ custom_nf
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ endlink)));
-+ custom_np
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ endlink)));
-+ custom_nii
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_nif
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_nip
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_nfi
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_nff
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_nfp
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_npi
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_npf
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_npp
-+ = build_function_type (void_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+
-+ custom_in
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ endlink));
-+ custom_ini
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ endlink)));
-+ custom_inf
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ endlink)));
-+ custom_inp
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ endlink)));
-+ custom_inii
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_inif
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_inip
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_infi
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_inff
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_infp
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_inpi
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_inpf
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_inpp
-+ = build_function_type (integer_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+
-+ custom_fn
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ endlink));
-+ custom_fni
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ endlink)));
-+ custom_fnf
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ endlink)));
-+ custom_fnp
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ endlink)));
-+ custom_fnii
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_fnif
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_fnip
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_fnfi
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_fnff
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_fnfp
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_fnpi
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_fnpf
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_fnpp
-+ = build_function_type (float_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+
-+
-+ custom_pn
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ endlink));
-+ custom_pni
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ endlink)));
-+ custom_pnf
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ endlink)));
-+ custom_pnp
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ endlink)));
-+ custom_pnii
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_pnif
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_pnip
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (integer_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_pnfi
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_pnff
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_pnfp
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (float_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+ custom_pnpi
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (integer_type_node)
-+ endlink))));
-+ custom_pnpf
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (float_type_node)
-+ endlink))));
-+ custom_pnpp
-+ = build_function_type (ptr_type_node,
-+ CUSTOM_NUM
-+ def_param (ptr_type_node)
-+ def_param (ptr_type_node)
-+ endlink))));
-+
-+
-+
-+ /* *INDENT-ON* */
-+
-+
-+ for (d = bdesc; d->name; d++)
-+ {
-+ builtin_function (d->name, *d->type, d->code,
-+ BUILT_IN_MD, NULL, NULL);
-+ }
-+}
-+
-+/* 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. */
-+
-+static rtx
-+nios2_expand_builtin (tree exp, rtx target, rtx subtarget,
-+ enum machine_mode mode, int ignore)
-+{
-+ const struct builtin_description *d;
-+ tree fndecl = TREE_OPERAND (TREE_OPERAND (exp, 0), 0);
-+ unsigned int fcode = DECL_FUNCTION_CODE (fndecl);
-+
-+ for (d = bdesc; d->name; d++)
-+ if (d->code == fcode)
-+ return (d->expander) (d, exp, target, subtarget, mode, ignore);
-+
-+ /* we should have seen one of the functins we registered */
-+ abort ();
-+}
-+
-+static rtx nios2_create_target (const struct builtin_description *, rtx);
-+
-+
-+static rtx
-+nios2_create_target (const struct builtin_description *d, rtx target)
-+{
-+ if (!target
-+ || !(*insn_data[d->icode].operand[0].predicate) (target,
-+ insn_data[d->icode].operand[0].mode))
-+ {
-+ target = gen_reg_rtx (insn_data[d->icode].operand[0].mode);
-+ }
-+
-+ return target;
-+}
-+
-+
-+static rtx nios2_extract_opcode (const struct builtin_description *, int, tree);
-+static rtx nios2_extract_operand (const struct builtin_description *, int, int, tree);
-+
-+static rtx
-+nios2_extract_opcode (const struct builtin_description *d, int op, tree arglist)
-+{
-+ enum machine_mode mode = insn_data[d->icode].operand[op].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ rtx opcode = expand_expr (arg, NULL_RTX, mode, 0);
-+ opcode = protect_from_queue (opcode, 0);
-+
-+ if (!(*insn_data[d->icode].operand[op].predicate) (opcode, mode))
-+ error ("Custom instruction opcode must be compile time constant in the range 0-255 for %s", d->name);
-+
-+ return opcode;
-+}
-+
-+static rtx
-+nios2_extract_operand (const struct builtin_description *d, int op, int argnum, tree arglist)
-+{
-+ enum machine_mode mode = insn_data[d->icode].operand[op].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ rtx operand = expand_expr (arg, NULL_RTX, mode, 0);
-+ operand = protect_from_queue (operand, 0);
-+
-+ if (!(*insn_data[d->icode].operand[op].predicate) (operand, mode))
-+ operand = copy_to_mode_reg (mode, operand);
-+
-+ /* ??? Better errors would be nice */
-+ if (!(*insn_data[d->icode].operand[op].predicate) (operand, mode))
-+ error ("Invalid argument %d to %s", argnum, d->name);
-+
-+ return operand;
-+}
-+
-+
-+static rtx
-+nios2_expand_custom_n (const struct builtin_description *d, tree exp,
-+ rtx target ATTRIBUTE_UNUSED, rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED, int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+
-+ /* custom_n should have exactly one operand */
-+ if (insn_data[d->icode].n_operands != 1)
-+ abort ();
-+
-+ opcode = nios2_extract_opcode (d, 0, arglist);
-+
-+ pat = GEN_FCN (d->icode) (opcode);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return 0;
-+}
-+
-+static rtx
-+nios2_expand_custom_Xn (const struct builtin_description *d, tree exp,
-+ rtx target, rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+
-+ /* custom_Xn should have exactly two operands */
-+ if (insn_data[d->icode].n_operands != 2)
-+ abort ();
-+
-+ target = nios2_create_target (d, target);
-+ opcode = nios2_extract_opcode (d, 1, arglist);
-+
-+ pat = GEN_FCN (d->icode) (target, opcode);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return target;
-+}
-+
-+static rtx
-+nios2_expand_custom_nX (const struct builtin_description *d, tree exp,
-+ rtx target ATTRIBUTE_UNUSED, rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED, int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+ rtx operands[1];
-+ int i;
-+
-+
-+ /* custom_nX should have exactly two operands */
-+ if (insn_data[d->icode].n_operands != 2)
-+ abort ();
-+
-+ opcode = nios2_extract_opcode (d, 0, arglist);
-+ for (i = 0; i < 1; i++)
-+ {
-+ arglist = TREE_CHAIN (arglist);
-+ operands[i] = nios2_extract_operand (d, i + 1, i + 1, arglist);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (opcode, operands[0]);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return 0;
-+}
-+
-+static rtx
-+nios2_expand_custom_XnX (const struct builtin_description *d, tree exp, rtx target,
-+ rtx subtarget ATTRIBUTE_UNUSED, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+ rtx operands[1];
-+ int i;
-+
-+ /* custom_Xn should have exactly three operands */
-+ if (insn_data[d->icode].n_operands != 3)
-+ abort ();
-+
-+ target = nios2_create_target (d, target);
-+ opcode = nios2_extract_opcode (d, 1, arglist);
-+
-+ for (i = 0; i < 1; i++)
-+ {
-+ arglist = TREE_CHAIN (arglist);
-+ operands[i] = nios2_extract_operand (d, i + 2, i + 1, arglist);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (target, opcode, operands[0]);
-+
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return target;
-+}
-+
-+static rtx
-+nios2_expand_custom_nXX (const struct builtin_description *d, tree exp, rtx target ATTRIBUTE_UNUSED,
-+ rtx subtarget ATTRIBUTE_UNUSED, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+ rtx operands[2];
-+ int i;
-+
-+
-+ /* custom_nX should have exactly three operands */
-+ if (insn_data[d->icode].n_operands != 3)
-+ abort ();
-+
-+ opcode = nios2_extract_opcode (d, 0, arglist);
-+ for (i = 0; i < 2; i++)
-+ {
-+ arglist = TREE_CHAIN (arglist);
-+ operands[i] = nios2_extract_operand (d, i + 1, i + 1, arglist);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (opcode, operands[0], operands[1]);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return 0;
-+}
-+
-+static rtx
-+nios2_expand_custom_XnXX (const struct builtin_description *d, tree exp, rtx target,
-+ rtx subtarget ATTRIBUTE_UNUSED, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx opcode;
-+ rtx operands[2];
-+ int i;
-+
-+
-+ /* custom_XnX should have exactly four operands */
-+ if (insn_data[d->icode].n_operands != 4)
-+ abort ();
-+
-+ target = nios2_create_target (d, target);
-+ opcode = nios2_extract_opcode (d, 1, arglist);
-+ for (i = 0; i < 2; i++)
-+ {
-+ arglist = TREE_CHAIN (arglist);
-+ operands[i] = nios2_extract_operand (d, i + 2, i + 1, arglist);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (target, opcode, operands[0], operands[1]);
-+
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return target;
-+}
-+
-+
-+
-+static rtx
-+nios2_expand_STXIO (const struct builtin_description *d, tree exp, rtx target ATTRIBUTE_UNUSED,
-+ rtx subtarget ATTRIBUTE_UNUSED, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx store_dest, store_val;
-+ enum insn_code icode = d->icode;
-+
-+ /* stores should have exactly two operands */
-+ if (insn_data[icode].n_operands != 2)
-+ abort ();
-+
-+ /* process the destination of the store */
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[0].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ store_dest = expand_expr (arg, NULL_RTX, VOIDmode, 0);
-+ store_dest = protect_from_queue (store_dest, 0);
-+
-+ store_dest = gen_rtx_MEM (mode, copy_to_mode_reg (Pmode, store_dest));
-+
-+ /* ??? Better errors would be nice */
-+ if (!(*insn_data[icode].operand[0].predicate) (store_dest, mode))
-+ error ("Invalid argument 1 to %s", d->name);
-+ }
-+
-+
-+ /* process the value to store */
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[1].mode;
-+ tree arg = TREE_VALUE (TREE_CHAIN (arglist));
-+ store_val = expand_expr (arg, NULL_RTX, mode, 0);
-+ store_val = protect_from_queue (store_val, 0);
-+
-+ if (!(*insn_data[icode].operand[1].predicate) (store_val, mode))
-+ store_val = copy_to_mode_reg (mode, store_val);
-+
-+ /* ??? Better errors would be nice */
-+ if (!(*insn_data[icode].operand[1].predicate) (store_val, mode))
-+ error ("Invalid argument 2 to %s", d->name);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (store_dest, store_val);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return 0;
-+}
-+
-+
-+static rtx
-+nios2_expand_LDXIO (const struct builtin_description * d, tree exp, rtx target,
-+ rtx subtarget ATTRIBUTE_UNUSED, enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx ld_src;
-+ enum insn_code icode = d->icode;
-+
-+ /* loads should have exactly two operands */
-+ if (insn_data[icode].n_operands != 2)
-+ abort ();
-+
-+ target = nios2_create_target (d, target);
-+
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[1].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ ld_src = expand_expr (arg, NULL_RTX, VOIDmode, 0);
-+ ld_src = protect_from_queue (ld_src, 0);
-+
-+ ld_src = gen_rtx_MEM (mode, copy_to_mode_reg (Pmode, ld_src));
-+
-+ /* ??? Better errors would be nice */
-+ if (!(*insn_data[icode].operand[1].predicate) (ld_src, mode))
-+ {
-+ error ("Invalid argument 1 to %s", d->name);
-+ }
-+ }
-+
-+ pat = GEN_FCN (d->icode) (target, ld_src);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return target;
-+}
-+
-+
-+static rtx
-+nios2_expand_sync (const struct builtin_description * d ATTRIBUTE_UNUSED,
-+ tree exp ATTRIBUTE_UNUSED, rtx target ATTRIBUTE_UNUSED,
-+ rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ emit_insn (gen_sync ());
-+ return 0;
-+}
-+
-+static rtx
-+nios2_expand_rdctl (const struct builtin_description * d ATTRIBUTE_UNUSED,
-+ tree exp ATTRIBUTE_UNUSED, rtx target ATTRIBUTE_UNUSED,
-+ rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx rdctl_reg;
-+ enum insn_code icode = d->icode;
-+
-+ /* rdctl should have exactly two operands */
-+ if (insn_data[icode].n_operands != 2)
-+ abort ();
-+
-+ target = nios2_create_target (d, target);
-+
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[1].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ rdctl_reg = expand_expr (arg, NULL_RTX, VOIDmode, 0);
-+ rdctl_reg = protect_from_queue (rdctl_reg, 0);
-+
-+ if (!(*insn_data[icode].operand[1].predicate) (rdctl_reg, mode))
-+ {
-+ error ("Control register number must be in range 0-31 for %s", d->name);
-+ }
-+ }
-+
-+ pat = GEN_FCN (d->icode) (target, rdctl_reg);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return target;
-+}
-+
-+static rtx
-+nios2_expand_wrctl (const struct builtin_description * d ATTRIBUTE_UNUSED,
-+ tree exp ATTRIBUTE_UNUSED, rtx target ATTRIBUTE_UNUSED,
-+ rtx subtarget ATTRIBUTE_UNUSED,
-+ enum machine_mode mode ATTRIBUTE_UNUSED,
-+ int ignore ATTRIBUTE_UNUSED)
-+{
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ rtx pat;
-+ rtx wrctl_reg, store_val;
-+ enum insn_code icode = d->icode;
-+
-+ /* stores should have exactly two operands */
-+ if (insn_data[icode].n_operands != 2)
-+ abort ();
-+
-+ /* process the destination of the store */
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[0].mode;
-+ tree arg = TREE_VALUE (arglist);
-+ wrctl_reg = expand_expr (arg, NULL_RTX, VOIDmode, 0);
-+ wrctl_reg = protect_from_queue (wrctl_reg, 0);
-+
-+ if (!(*insn_data[icode].operand[0].predicate) (wrctl_reg, mode))
-+ error ("Control register number must be in range 0-31 for %s", d->name);
-+ }
-+
-+
-+ /* process the value to store */
-+ {
-+ enum machine_mode mode = insn_data[icode].operand[1].mode;
-+ tree arg = TREE_VALUE (TREE_CHAIN (arglist));
-+ store_val = expand_expr (arg, NULL_RTX, mode, 0);
-+ store_val = protect_from_queue (store_val, 0);
-+
-+ if (!(*insn_data[icode].operand[1].predicate) (store_val, mode))
-+ store_val = copy_to_mode_reg (mode, store_val);
-+
-+ /* ??? Better errors would be nice */
-+ if (!(*insn_data[icode].operand[1].predicate) (store_val, mode))
-+ error ("Invalid argument 2 to %s", d->name);
-+ }
-+
-+ pat = GEN_FCN (d->icode) (wrctl_reg, store_val);
-+ if (!pat)
-+ return 0;
-+ emit_insn (pat);
-+ return 0;
-+}
-+
-+
-+#include "gt-nios2.h"
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2-dp-bit.c gcc-3.4.6/gcc/config/nios2/nios2-dp-bit.c
---- gcc-3.4.6.orig/gcc/config/nios2/nios2-dp-bit.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2-dp-bit.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,1652 @@
-+
-+/* This is a software floating point library which can be used
-+ for targets without hardware floating point.
-+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004
-+ Free Software Foundation, Inc.
-+
-+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 other files,
-+ some of which are compiled with GCC, to produce an executable,
-+ this library does not by itself 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. */
-+
-+/* This implements IEEE 754 format arithmetic, but does not provide a
-+ mechanism for setting the rounding mode, or for generating or handling
-+ exceptions.
-+
-+ The original code by Steve Chamberlain, hacked by Mark Eichin and Jim
-+ Wilson, all of Cygnus Support. */
-+
-+/* The intended way to use this file is to make two copies, add `#define FLOAT'
-+ to one copy, then compile both copies and add them to libgcc.a. */
-+
-+#include "tconfig.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+#include "config/fp-bit.h"
-+
-+/* The following macros can be defined to change the behavior of this file:
-+ FLOAT: Implement a `float', aka SFmode, fp library. If this is not
-+ defined, then this file implements a `double', aka DFmode, fp library.
-+ FLOAT_ONLY: Used with FLOAT, to implement a `float' only library, i.e.
-+ don't include float->double conversion which requires the double library.
-+ This is useful only for machines which can't support doubles, e.g. some
-+ 8-bit processors.
-+ CMPtype: Specify the type that floating point compares should return.
-+ This defaults to SItype, aka int.
-+ US_SOFTWARE_GOFAST: This makes all entry points use the same names as the
-+ US Software goFast library.
-+ _DEBUG_BITFLOAT: This makes debugging the code a little easier, by adding
-+ two integers to the FLO_union_type.
-+ NO_DENORMALS: Disable handling of denormals.
-+ NO_NANS: Disable nan and infinity handling
-+ SMALL_MACHINE: Useful when operations on QIs and HIs are faster
-+ than on an SI */
-+
-+/* We don't currently support extended floats (long doubles) on machines
-+ without hardware to deal with them.
-+
-+ These stubs are just to keep the linker from complaining about unresolved
-+ references which can be pulled in from libio & libstdc++, even if the
-+ user isn't using long doubles. However, they may generate an unresolved
-+ external to abort if abort is not used by the function, and the stubs
-+ are referenced from within libc, since libgcc goes before and after the
-+ system library. */
-+
-+#ifdef DECLARE_LIBRARY_RENAMES
-+ DECLARE_LIBRARY_RENAMES
-+#endif
-+
-+#ifdef EXTENDED_FLOAT_STUBS
-+extern void abort (void);
-+void __extendsfxf2 (void) { abort(); }
-+void __extenddfxf2 (void) { abort(); }
-+void __truncxfdf2 (void) { abort(); }
-+void __truncxfsf2 (void) { abort(); }
-+void __fixxfsi (void) { abort(); }
-+void __floatsixf (void) { abort(); }
-+void __addxf3 (void) { abort(); }
-+void __subxf3 (void) { abort(); }
-+void __mulxf3 (void) { abort(); }
-+void __divxf3 (void) { abort(); }
-+void __negxf2 (void) { abort(); }
-+void __eqxf2 (void) { abort(); }
-+void __nexf2 (void) { abort(); }
-+void __gtxf2 (void) { abort(); }
-+void __gexf2 (void) { abort(); }
-+void __lexf2 (void) { abort(); }
-+void __ltxf2 (void) { abort(); }
-+
-+void __extendsftf2 (void) { abort(); }
-+void __extenddftf2 (void) { abort(); }
-+void __trunctfdf2 (void) { abort(); }
-+void __trunctfsf2 (void) { abort(); }
-+void __fixtfsi (void) { abort(); }
-+void __floatsitf (void) { abort(); }
-+void __addtf3 (void) { abort(); }
-+void __subtf3 (void) { abort(); }
-+void __multf3 (void) { abort(); }
-+void __divtf3 (void) { abort(); }
-+void __negtf2 (void) { abort(); }
-+void __eqtf2 (void) { abort(); }
-+void __netf2 (void) { abort(); }
-+void __gttf2 (void) { abort(); }
-+void __getf2 (void) { abort(); }
-+void __letf2 (void) { abort(); }
-+void __lttf2 (void) { abort(); }
-+#else /* !EXTENDED_FLOAT_STUBS, rest of file */
-+
-+/* IEEE "special" number predicates */
-+
-+#ifdef NO_NANS
-+
-+#define nan() 0
-+#define isnan(x) 0
-+#define isinf(x) 0
-+#else
-+
-+#if defined L_thenan_sf
-+const fp_number_type __thenan_sf = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined L_thenan_df
-+const fp_number_type __thenan_df = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined L_thenan_tf
-+const fp_number_type __thenan_tf = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined TFLOAT
-+extern const fp_number_type __thenan_tf;
-+#elif defined FLOAT
-+extern const fp_number_type __thenan_sf;
-+#else
-+extern const fp_number_type __thenan_df;
-+#endif
-+
-+INLINE
-+static fp_number_type *
-+nan (void)
-+{
-+ /* Discard the const qualifier... */
-+#ifdef TFLOAT
-+ return (fp_number_type *) (& __thenan_tf);
-+#elif defined FLOAT
-+ return (fp_number_type *) (& __thenan_sf);
-+#else
-+ return (fp_number_type *) (& __thenan_df);
-+#endif
-+}
-+
-+INLINE
-+static int
-+isnan ( fp_number_type * x)
-+{
-+ return x->class == CLASS_SNAN || x->class == CLASS_QNAN;
-+}
-+
-+INLINE
-+static int
-+isinf ( fp_number_type * x)
-+{
-+ return x->class == CLASS_INFINITY;
-+}
-+
-+#endif /* NO_NANS */
-+
-+INLINE
-+static int
-+iszero ( fp_number_type * x)
-+{
-+ return x->class == CLASS_ZERO;
-+}
-+
-+INLINE
-+static void
-+flip_sign ( fp_number_type * x)
-+{
-+ x->sign = !x->sign;
-+}
-+
-+extern FLO_type pack_d ( fp_number_type * );
-+
-+#if defined(L_pack_df) || defined(L_pack_sf) || defined(L_pack_tf)
-+FLO_type
-+pack_d ( fp_number_type * src)
-+{
-+ FLO_union_type dst;
-+ fractype fraction = src->fraction.ll; /* wasn't unsigned before? */
-+ int sign = src->sign;
-+ int exp = 0;
-+
-+ if (LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && (isnan (src) || isinf (src)))
-+ {
-+ /* We can't represent these values accurately. By using the
-+ largest possible magnitude, we guarantee that the conversion
-+ of infinity is at least as big as any finite number. */
-+ exp = EXPMAX;
-+ fraction = ((fractype) 1 << FRACBITS) - 1;
-+ }
-+ else if (isnan (src))
-+ {
-+ exp = EXPMAX;
-+ if (src->class == CLASS_QNAN || 1)
-+ {
-+#ifdef QUIET_NAN_NEGATED
-+ fraction |= QUIET_NAN - 1;
-+#else
-+ fraction |= QUIET_NAN;
-+#endif
-+ }
-+ }
-+ else if (isinf (src))
-+ {
-+ exp = EXPMAX;
-+ fraction = 0;
-+ }
-+ else if (iszero (src))
-+ {
-+ exp = 0;
-+ fraction = 0;
-+ }
-+ else if (fraction == 0)
-+ {
-+ exp = 0;
-+ }
-+ else
-+ {
-+ if (src->normal_exp < NORMAL_EXPMIN)
-+ {
-+#ifdef NO_DENORMALS
-+ /* Go straight to a zero representation if denormals are not
-+ supported. The denormal handling would be harmless but
-+ isn't unnecessary. */
-+ exp = 0;
-+ fraction = 0;
-+#else /* NO_DENORMALS */
-+ /* This number's exponent is too low to fit into the bits
-+ available in the number, so we'll store 0 in the exponent and
-+ shift the fraction to the right to make up for it. */
-+
-+ int shift = NORMAL_EXPMIN - src->normal_exp;
-+
-+ exp = 0;
-+
-+ if (shift > FRAC_NBITS - NGARDS)
-+ {
-+ /* No point shifting, since it's more that 64 out. */
-+ fraction = 0;
-+ }
-+ else
-+ {
-+ int lowbit = (fraction & (((fractype)1 << shift) - 1)) ? 1 : 0;
-+ fraction = (fraction >> shift) | lowbit;
-+ }
-+ if ((fraction & GARDMASK) == GARDMSB)
-+ {
-+ if ((fraction & (1 << NGARDS)))
-+ fraction += GARDROUND + 1;
-+ }
-+ else
-+ {
-+ /* Add to the guards to round up. */
-+ fraction += GARDROUND;
-+ }
-+ /* Perhaps the rounding means we now need to change the
-+ exponent, because the fraction is no longer denormal. */
-+ if (fraction >= IMPLICIT_1)
-+ {
-+ exp += 1;
-+ }
-+ fraction >>= NGARDS;
-+#endif /* NO_DENORMALS */
-+ }
-+ else if (!LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS)
-+ && src->normal_exp > EXPBIAS)
-+ {
-+ exp = EXPMAX;
-+ fraction = 0;
-+ }
-+ else
-+ {
-+ exp = src->normal_exp + EXPBIAS;
-+ if (!ROUND_TOWARDS_ZERO)
-+ {
-+ /* IF the gard bits are the all zero, but the first, then we're
-+ half way between two numbers, choose the one which makes the
-+ lsb of the answer 0. */
-+ if ((fraction & GARDMASK) == GARDMSB)
-+ {
-+ if (fraction & (1 << NGARDS))
-+ fraction += GARDROUND + 1;
-+ }
-+ else
-+ {
-+ /* Add a one to the guards to round up */
-+ fraction += GARDROUND;
-+ }
-+ if (fraction >= IMPLICIT_2)
-+ {
-+ fraction >>= 1;
-+ exp += 1;
-+ }
-+ }
-+ fraction >>= NGARDS;
-+
-+ if (LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && exp > EXPMAX)
-+ {
-+ /* Saturate on overflow. */
-+ exp = EXPMAX;
-+ fraction = ((fractype) 1 << FRACBITS) - 1;
-+ }
-+ }
-+ }
-+
-+ /* We previously used bitfields to store the number, but this doesn't
-+ handle little/big endian systems conveniently, so use shifts and
-+ masks */
-+#ifdef FLOAT_BIT_ORDER_MISMATCH
-+ dst.bits.fraction = fraction;
-+ dst.bits.exp = exp;
-+ dst.bits.sign = sign;
-+#else
-+# if defined TFLOAT && defined HALFFRACBITS
-+ {
-+ halffractype high, low, unity;
-+ int lowsign, lowexp;
-+
-+ unity = (halffractype) 1 << HALFFRACBITS;
-+
-+ /* Set HIGH to the high double's significand, masking out the implicit 1.
-+ Set LOW to the low double's full significand. */
-+ high = (fraction >> (FRACBITS - HALFFRACBITS)) & (unity - 1);
-+ low = fraction & (unity * 2 - 1);
-+
-+ /* Get the initial sign and exponent of the low double. */
-+ lowexp = exp - HALFFRACBITS - 1;
-+ lowsign = sign;
-+
-+ /* HIGH should be rounded like a normal double, making |LOW| <=
-+ 0.5 ULP of HIGH. Assume round-to-nearest. */
-+ if (exp < EXPMAX)
-+ if (low > unity || (low == unity && (high & 1) == 1))
-+ {
-+ /* Round HIGH up and adjust LOW to match. */
-+ high++;
-+ if (high == unity)
-+ {
-+ /* May make it infinite, but that's OK. */
-+ high = 0;
-+ exp++;
-+ }
-+ low = unity * 2 - low;
-+ lowsign ^= 1;
-+ }
-+
-+ high |= (halffractype) exp << HALFFRACBITS;
-+ high |= (halffractype) sign << (HALFFRACBITS + EXPBITS);
-+
-+ if (exp == EXPMAX || exp == 0 || low == 0)
-+ low = 0;
-+ else
-+ {
-+ while (lowexp > 0 && low < unity)
-+ {
-+ low <<= 1;
-+ lowexp--;
-+ }
-+
-+ if (lowexp <= 0)
-+ {
-+ halffractype roundmsb, round;
-+ int shift;
-+
-+ shift = 1 - lowexp;
-+ roundmsb = (1 << (shift - 1));
-+ round = low & ((roundmsb << 1) - 1);
-+
-+ low >>= shift;
-+ lowexp = 0;
-+
-+ if (round > roundmsb || (round == roundmsb && (low & 1) == 1))
-+ {
-+ low++;
-+ if (low == unity)
-+ /* LOW rounds up to the smallest normal number. */
-+ lowexp++;
-+ }
-+ }
-+
-+ low &= unity - 1;
-+ low |= (halffractype) lowexp << HALFFRACBITS;
-+ low |= (halffractype) lowsign << (HALFFRACBITS + EXPBITS);
-+ }
-+ dst.value_raw = ((fractype) high << HALFSHIFT) | low;
-+ }
-+# else
-+ dst.value_raw = fraction & ((((fractype)1) << FRACBITS) - (fractype)1);
-+ dst.value_raw |= ((fractype) (exp & ((1 << EXPBITS) - 1))) << FRACBITS;
-+ dst.value_raw |= ((fractype) (sign & 1)) << (FRACBITS | EXPBITS);
-+# endif
-+#endif
-+
-+#if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT)
-+#ifdef TFLOAT
-+ {
-+ qrtrfractype tmp1 = dst.words[0];
-+ qrtrfractype tmp2 = dst.words[1];
-+ dst.words[0] = dst.words[3];
-+ dst.words[1] = dst.words[2];
-+ dst.words[2] = tmp2;
-+ dst.words[3] = tmp1;
-+ }
-+#else
-+ {
-+ halffractype tmp = dst.words[0];
-+ dst.words[0] = dst.words[1];
-+ dst.words[1] = tmp;
-+ }
-+#endif
-+#endif
-+
-+ return dst.value;
-+}
-+#endif
-+
-+#if defined(L_unpack_df) || defined(L_unpack_sf) || defined(L_unpack_tf)
-+void
-+unpack_d (FLO_union_type * src, fp_number_type * dst)
-+{
-+ /* We previously used bitfields to store the number, but this doesn't
-+ handle little/big endian systems conveniently, so use shifts and
-+ masks */
-+ fractype fraction;
-+ int exp;
-+ int sign;
-+
-+#if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT)
-+ FLO_union_type swapped;
-+
-+#ifdef TFLOAT
-+ swapped.words[0] = src->words[3];
-+ swapped.words[1] = src->words[2];
-+ swapped.words[2] = src->words[1];
-+ swapped.words[3] = src->words[0];
-+#else
-+ swapped.words[0] = src->words[1];
-+ swapped.words[1] = src->words[0];
-+#endif
-+ src = &swapped;
-+#endif
-+
-+#ifdef FLOAT_BIT_ORDER_MISMATCH
-+ fraction = src->bits.fraction;
-+ exp = src->bits.exp;
-+ sign = src->bits.sign;
-+#else
-+# if defined TFLOAT && defined HALFFRACBITS
-+ {
-+ halffractype high, low;
-+
-+ high = src->value_raw >> HALFSHIFT;
-+ low = src->value_raw & (((fractype)1 << HALFSHIFT) - 1);
-+
-+ fraction = high & ((((fractype)1) << HALFFRACBITS) - 1);
-+ fraction <<= FRACBITS - HALFFRACBITS;
-+ exp = ((int)(high >> HALFFRACBITS)) & ((1 << EXPBITS) - 1);
-+ sign = ((int)(high >> (((HALFFRACBITS + EXPBITS))))) & 1;
-+
-+ if (exp != EXPMAX && exp != 0 && low != 0)
-+ {
-+ int lowexp = ((int)(low >> HALFFRACBITS)) & ((1 << EXPBITS) - 1);
-+ int lowsign = ((int)(low >> (((HALFFRACBITS + EXPBITS))))) & 1;
-+ int shift;
-+ fractype xlow;
-+
-+ xlow = low & ((((fractype)1) << HALFFRACBITS) - 1);
-+ if (lowexp)
-+ xlow |= (((halffractype)1) << HALFFRACBITS);
-+ else
-+ lowexp = 1;
-+ shift = (FRACBITS - HALFFRACBITS) - (exp - lowexp);
-+ if (shift > 0)
-+ xlow <<= shift;
-+ else if (shift < 0)
-+ xlow >>= -shift;
-+ if (sign == lowsign)
-+ fraction += xlow;
-+ else if (fraction >= xlow)
-+ fraction -= xlow;
-+ else
-+ {
-+ /* The high part is a power of two but the full number is lower.
-+ This code will leave the implicit 1 in FRACTION, but we'd
-+ have added that below anyway. */
-+ fraction = (((fractype) 1 << FRACBITS) - xlow) << 1;
-+ exp--;
-+ }
-+ }
-+ }
-+# else
-+ fraction = src->value_raw & ((((fractype)1) << FRACBITS) - 1);
-+ exp = ((int)(src->value_raw >> FRACBITS)) & ((1 << EXPBITS) - 1);
-+ sign = ((int)(src->value_raw >> (FRACBITS + EXPBITS))) & 1;
-+# endif
-+#endif
-+
-+ dst->sign = sign;
-+ if (exp == 0)
-+ {
-+ /* Hmm. Looks like 0 */
-+ if (fraction == 0
-+#ifdef NO_DENORMALS
-+ || 1
-+#endif
-+ )
-+ {
-+ /* tastes like zero */
-+ dst->class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ /* Zero exponent with nonzero fraction - it's denormalized,
-+ so there isn't a leading implicit one - we'll shift it so
-+ it gets one. */
-+ dst->normal_exp = exp - EXPBIAS + 1;
-+ fraction <<= NGARDS;
-+
-+ dst->class = CLASS_NUMBER;
-+#if 1
-+ while (fraction < IMPLICIT_1)
-+ {
-+ fraction <<= 1;
-+ dst->normal_exp--;
-+ }
-+#endif
-+ dst->fraction.ll = fraction;
-+ }
-+ }
-+ else if (!LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && exp == EXPMAX)
-+ {
-+ /* Huge exponent*/
-+ if (fraction == 0)
-+ {
-+ /* Attached to a zero fraction - means infinity */
-+ dst->class = CLASS_INFINITY;
-+ }
-+ else
-+ {
-+ /* Nonzero fraction, means nan */
-+#ifdef QUIET_NAN_NEGATED
-+ if ((fraction & QUIET_NAN) == 0)
-+#else
-+ if (fraction & QUIET_NAN)
-+#endif
-+ {
-+ dst->class = CLASS_QNAN;
-+ }
-+ else
-+ {
-+ dst->class = CLASS_SNAN;
-+ }
-+ /* Keep the fraction part as the nan number */
-+ dst->fraction.ll = fraction;
-+ }
-+ }
-+ else
-+ {
-+ /* Nothing strange about this number */
-+ dst->normal_exp = exp - EXPBIAS;
-+ dst->class = CLASS_NUMBER;
-+ dst->fraction.ll = (fraction << NGARDS) | IMPLICIT_1;
-+ }
-+}
-+#endif /* L_unpack_df || L_unpack_sf */
-+
-+#if defined(L_addsub_sf) || defined(L_addsub_df) || defined(L_addsub_tf)
-+static fp_number_type *
-+_fpadd_parts (fp_number_type * a,
-+ fp_number_type * b,
-+ fp_number_type * tmp)
-+{
-+ intfrac tfraction;
-+
-+ /* Put commonly used fields in local variables. */
-+ int a_normal_exp;
-+ int b_normal_exp;
-+ fractype a_fraction;
-+ fractype b_fraction;
-+
-+ if (isnan (a))
-+ {
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ return b;
-+ }
-+ if (isinf (a))
-+ {
-+ /* Adding infinities with opposite signs yields a NaN. */
-+ if (isinf (b) && a->sign != b->sign)
-+ return nan ();
-+ return a;
-+ }
-+ if (isinf (b))
-+ {
-+ return b;
-+ }
-+ if (iszero (b))
-+ {
-+ if (iszero (a))
-+ {
-+ *tmp = *a;
-+ tmp->sign = a->sign & b->sign;
-+ return tmp;
-+ }
-+ return a;
-+ }
-+ if (iszero (a))
-+ {
-+ return b;
-+ }
-+
-+ /* Got two numbers. shift the smaller and increment the exponent till
-+ they're the same */
-+ {
-+ int diff;
-+
-+ a_normal_exp = a->normal_exp;
-+ b_normal_exp = b->normal_exp;
-+ a_fraction = a->fraction.ll;
-+ b_fraction = b->fraction.ll;
-+
-+ diff = a_normal_exp - b_normal_exp;
-+
-+ if (diff < 0)
-+ diff = -diff;
-+ if (diff < FRAC_NBITS)
-+ {
-+ /* ??? This does shifts one bit at a time. Optimize. */
-+ while (a_normal_exp > b_normal_exp)
-+ {
-+ b_normal_exp++;
-+ LSHIFT (b_fraction);
-+ }
-+ while (b_normal_exp > a_normal_exp)
-+ {
-+ a_normal_exp++;
-+ LSHIFT (a_fraction);
-+ }
-+ }
-+ else
-+ {
-+ /* Somethings's up.. choose the biggest */
-+ if (a_normal_exp > b_normal_exp)
-+ {
-+ b_normal_exp = a_normal_exp;
-+ b_fraction = 0;
-+ }
-+ else
-+ {
-+ a_normal_exp = b_normal_exp;
-+ a_fraction = 0;
-+ }
-+ }
-+ }
-+
-+ if (a->sign != b->sign)
-+ {
-+ if (a->sign)
-+ {
-+ tfraction = -a_fraction + b_fraction;
-+ }
-+ else
-+ {
-+ tfraction = a_fraction - b_fraction;
-+ }
-+ if (tfraction >= 0)
-+ {
-+ tmp->sign = 0;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = tfraction;
-+ }
-+ else
-+ {
-+ tmp->sign = 1;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = -tfraction;
-+ }
-+ /* and renormalize it */
-+
-+ while (tmp->fraction.ll < IMPLICIT_1 && tmp->fraction.ll)
-+ {
-+ tmp->fraction.ll <<= 1;
-+ tmp->normal_exp--;
-+ }
-+ }
-+ else
-+ {
-+ tmp->sign = a->sign;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = a_fraction + b_fraction;
-+ }
-+ tmp->class = CLASS_NUMBER;
-+ /* Now the fraction is added, we have to shift down to renormalize the
-+ number */
-+
-+ if (tmp->fraction.ll >= IMPLICIT_2)
-+ {
-+ LSHIFT (tmp->fraction.ll);
-+ tmp->normal_exp++;
-+ }
-+ return tmp;
-+
-+}
-+
-+FLO_type
-+add (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpadd_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+
-+FLO_type
-+sub (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ b.sign ^= 1;
-+
-+ res = _fpadd_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_addsub_sf || L_addsub_df */
-+
-+#if defined(L_mul_sf) || defined(L_mul_df) || defined(L_mul_tf)
-+static inline __attribute__ ((__always_inline__)) fp_number_type *
-+_fpmul_parts ( fp_number_type * a,
-+ fp_number_type * b,
-+ fp_number_type * tmp)
-+{
-+ fractype low = 0;
-+ fractype high = 0;
-+
-+ if (isnan (a))
-+ {
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+ if (isinf (a))
-+ {
-+ if (iszero (b))
-+ return nan ();
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (isinf (b))
-+ {
-+ if (iszero (a))
-+ {
-+ return nan ();
-+ }
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+ if (iszero (a))
-+ {
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (iszero (b))
-+ {
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+
-+ /* Calculate the mantissa by multiplying both numbers to get a
-+ twice-as-wide number. */
-+ {
-+#if defined(NO_DI_MODE) || defined(TFLOAT)
-+ {
-+ fractype x = a->fraction.ll;
-+ fractype ylow = b->fraction.ll;
-+ fractype yhigh = 0;
-+ int bit;
-+
-+ /* ??? This does multiplies one bit at a time. Optimize. */
-+ for (bit = 0; bit < FRAC_NBITS; bit++)
-+ {
-+ int carry;
-+
-+ if (x & 1)
-+ {
-+ carry = (low += ylow) < ylow;
-+ high += yhigh + carry;
-+ }
-+ yhigh <<= 1;
-+ if (ylow & FRACHIGH)
-+ {
-+ yhigh |= 1;
-+ }
-+ ylow <<= 1;
-+ x >>= 1;
-+ }
-+ }
-+#elif defined(FLOAT)
-+ /* Multiplying two USIs to get a UDI, we're safe. */
-+ {
-+ UDItype answer = (UDItype)a->fraction.ll * (UDItype)b->fraction.ll;
-+
-+ high = answer >> BITS_PER_SI;
-+ low = answer;
-+ }
-+#else
-+ /* fractype is DImode, but we need the result to be twice as wide.
-+ Assuming a widening multiply from DImode to TImode is not
-+ available, build one by hand. */
-+ {
-+ USItype nl = a->fraction.ll;
-+ USItype nh = a->fraction.ll >> BITS_PER_SI;
-+ USItype ml = b->fraction.ll;
-+ USItype mh = b->fraction.ll >> BITS_PER_SI;
-+ UDItype pp_ll = (UDItype) ml * nl;
-+ UDItype pp_hl = (UDItype) mh * nl;
-+ UDItype pp_lh = (UDItype) ml * nh;
-+ UDItype pp_hh = (UDItype) mh * nh;
-+ UDItype res2 = 0;
-+ UDItype res0 = 0;
-+ UDItype ps_hh__ = pp_hl + pp_lh;
-+ if (ps_hh__ < pp_hl)
-+ res2 += (UDItype)1 << BITS_PER_SI;
-+ pp_hl = (UDItype)(USItype)ps_hh__ << BITS_PER_SI;
-+ res0 = pp_ll + pp_hl;
-+ if (res0 < pp_ll)
-+ res2++;
-+ res2 += (ps_hh__ >> BITS_PER_SI) + pp_hh;
-+ high = res2;
-+ low = res0;
-+ }
-+#endif
-+ }
-+
-+ tmp->normal_exp = a->normal_exp + b->normal_exp
-+ + FRAC_NBITS - (FRACBITS + NGARDS);
-+ tmp->sign = a->sign != b->sign;
-+ while (high >= IMPLICIT_2)
-+ {
-+ tmp->normal_exp++;
-+ if (high & 1)
-+ {
-+ low >>= 1;
-+ low |= FRACHIGH;
-+ }
-+ high >>= 1;
-+ }
-+ while (high < IMPLICIT_1)
-+ {
-+ tmp->normal_exp--;
-+
-+ high <<= 1;
-+ if (low & FRACHIGH)
-+ high |= 1;
-+ low <<= 1;
-+ }
-+ /* rounding is tricky. if we only round if it won't make us round later. */
-+#if 0
-+ if (low & FRACHIGH2)
-+ {
-+ if (((high & GARDMASK) != GARDMSB)
-+ && (((high + 1) & GARDMASK) == GARDMSB))
-+ {
-+ /* don't round, it gets done again later. */
-+ }
-+ else
-+ {
-+ high++;
-+ }
-+ }
-+#endif
-+ if (!ROUND_TOWARDS_ZERO && (high & GARDMASK) == GARDMSB)
-+ {
-+ if (high & (1 << NGARDS))
-+ {
-+ /* half way, so round to even */
-+ high += GARDROUND + 1;
-+ }
-+ else if (low)
-+ {
-+ /* but we really weren't half way */
-+ high += GARDROUND + 1;
-+ }
-+ }
-+ tmp->fraction.ll = high;
-+ tmp->class = CLASS_NUMBER;
-+ return tmp;
-+}
-+
-+FLO_type
-+multiply (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpmul_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_mul_sf || L_mul_df */
-+
-+#if defined(L_div_sf) || defined(L_div_df) || defined(L_div_tf)
-+static inline __attribute__ ((__always_inline__)) fp_number_type *
-+_fpdiv_parts (fp_number_type * a,
-+ fp_number_type * b)
-+{
-+ fractype bit;
-+ fractype numerator;
-+ fractype denominator;
-+ fractype quotient;
-+
-+ if (isnan (a))
-+ {
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ return b;
-+ }
-+
-+ a->sign = a->sign ^ b->sign;
-+
-+ if (isinf (a) || iszero (a))
-+ {
-+ if (a->class == b->class)
-+ return nan ();
-+ return a;
-+ }
-+
-+ if (isinf (b))
-+ {
-+ a->fraction.ll = 0;
-+ a->normal_exp = 0;
-+ return a;
-+ }
-+ if (iszero (b))
-+ {
-+ a->class = CLASS_INFINITY;
-+ return a;
-+ }
-+
-+ /* Calculate the mantissa by multiplying both 64bit numbers to get a
-+ 128 bit number */
-+ {
-+ /* quotient =
-+ ( numerator / denominator) * 2^(numerator exponent - denominator exponent)
-+ */
-+
-+ a->normal_exp = a->normal_exp - b->normal_exp;
-+ numerator = a->fraction.ll;
-+ denominator = b->fraction.ll;
-+
-+ if (numerator < denominator)
-+ {
-+ /* Fraction will be less than 1.0 */
-+ numerator *= 2;
-+ a->normal_exp--;
-+ }
-+ bit = IMPLICIT_1;
-+ quotient = 0;
-+ /* ??? Does divide one bit at a time. Optimize. */
-+ while (bit)
-+ {
-+ if (numerator >= denominator)
-+ {
-+ quotient |= bit;
-+ numerator -= denominator;
-+ }
-+ bit >>= 1;
-+ numerator *= 2;
-+ }
-+
-+ if (!ROUND_TOWARDS_ZERO && (quotient & GARDMASK) == GARDMSB)
-+ {
-+ if (quotient & (1 << NGARDS))
-+ {
-+ /* half way, so round to even */
-+ quotient += GARDROUND + 1;
-+ }
-+ else if (numerator)
-+ {
-+ /* but we really weren't half way, more bits exist */
-+ quotient += GARDROUND + 1;
-+ }
-+ }
-+
-+ a->fraction.ll = quotient;
-+ return (a);
-+ }
-+}
-+
-+FLO_type
-+divide (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpdiv_parts (&a, &b);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_div_sf || L_div_df */
-+
-+#if defined(L_fpcmp_parts_sf) || defined(L_fpcmp_parts_df) \
-+ || defined(L_fpcmp_parts_tf)
-+/* according to the demo, fpcmp returns a comparison with 0... thus
-+ a<b -> -1
-+ a==b -> 0
-+ a>b -> +1
-+ */
-+
-+int
-+__fpcmp_parts (fp_number_type * a, fp_number_type * b)
-+{
-+#if 0
-+ /* either nan -> unordered. Must be checked outside of this routine. */
-+ if (isnan (a) && isnan (b))
-+ {
-+ return 1; /* still unordered! */
-+ }
-+#endif
-+
-+ if (isnan (a) || isnan (b))
-+ {
-+ return 1; /* how to indicate unordered compare? */
-+ }
-+ if (isinf (a) && isinf (b))
-+ {
-+ /* +inf > -inf, but +inf != +inf */
-+ /* b \a| +inf(0)| -inf(1)
-+ ______\+--------+--------
-+ +inf(0)| a==b(0)| a<b(-1)
-+ -------+--------+--------
-+ -inf(1)| a>b(1) | a==b(0)
-+ -------+--------+--------
-+ So since unordered must be nonzero, just line up the columns...
-+ */
-+ return b->sign - a->sign;
-+ }
-+ /* but not both... */
-+ if (isinf (a))
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (isinf (b))
-+ {
-+ return b->sign ? 1 : -1;
-+ }
-+ if (iszero (a) && iszero (b))
-+ {
-+ return 0;
-+ }
-+ if (iszero (a))
-+ {
-+ return b->sign ? 1 : -1;
-+ }
-+ if (iszero (b))
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ /* now both are "normal". */
-+ if (a->sign != b->sign)
-+ {
-+ /* opposite signs */
-+ return a->sign ? -1 : 1;
-+ }
-+ /* same sign; exponents? */
-+ if (a->normal_exp > b->normal_exp)
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (a->normal_exp < b->normal_exp)
-+ {
-+ return a->sign ? 1 : -1;
-+ }
-+ /* same exponents; check size. */
-+ if (a->fraction.ll > b->fraction.ll)
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (a->fraction.ll < b->fraction.ll)
-+ {
-+ return a->sign ? 1 : -1;
-+ }
-+ /* after all that, they're equal. */
-+ return 0;
-+}
-+#endif
-+
-+#if defined(L_compare_sf) || defined(L_compare_df) || defined(L_compoare_tf)
-+CMPtype
-+compare (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_compare_sf || L_compare_df */
-+
-+#ifndef US_SOFTWARE_GOFAST
-+
-+/* These should be optimized for their specific tasks someday. */
-+
-+#if defined(L_eq_sf) || defined(L_eq_df) || defined(L_eq_tf)
-+CMPtype
-+_eq_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth == 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_eq_sf || L_eq_df */
-+
-+#if defined(L_ne_sf) || defined(L_ne_df) || defined(L_ne_tf)
-+CMPtype
-+_ne_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* true, truth != 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_ne_sf || L_ne_df */
-+
-+#if defined(L_gt_sf) || defined(L_gt_df) || defined(L_gt_tf)
-+CMPtype
-+_gt_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return -1; /* false, truth > 0 */
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_gt_sf || L_gt_df */
-+
-+#if defined(L_ge_sf) || defined(L_ge_df) || defined(L_ge_tf)
-+CMPtype
-+_ge_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return -1; /* false, truth >= 0 */
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_ge_sf || L_ge_df */
-+
-+#if defined(L_lt_sf) || defined(L_lt_df) || defined(L_lt_tf)
-+CMPtype
-+_lt_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth < 0 */
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_lt_sf || L_lt_df */
-+
-+#if defined(L_le_sf) || defined(L_le_df) || defined(L_le_tf)
-+CMPtype
-+_le_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth <= 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_le_sf || L_le_df */
-+
-+#endif /* ! US_SOFTWARE_GOFAST */
-+
-+#if defined(L_unord_sf) || defined(L_unord_df) || defined(L_unord_tf)
-+CMPtype
-+_unord_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ return (isnan (&a) || isnan (&b));
-+}
-+#endif /* L_unord_sf || L_unord_df */
-+
-+#if defined(L_si_to_sf) || defined(L_si_to_df) || defined(L_si_to_tf)
-+FLO_type
-+si_to_float (SItype arg_a)
-+{
-+ fp_number_type in;
-+
-+ in.class = CLASS_NUMBER;
-+ in.sign = arg_a < 0;
-+ if (!arg_a)
-+ {
-+ in.class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ in.normal_exp = FRACBITS + NGARDS;
-+ if (in.sign)
-+ {
-+ /* Special case for minint, since there is no +ve integer
-+ representation for it */
-+ if (arg_a == (- MAX_SI_INT - 1))
-+ {
-+ return (FLO_type)(- MAX_SI_INT - 1);
-+ }
-+ in.fraction.ll = (-arg_a);
-+ }
-+ else
-+ in.fraction.ll = arg_a;
-+
-+ while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll <<= 1;
-+ in.normal_exp -= 1;
-+ }
-+ }
-+ return pack_d (&in);
-+}
-+#endif /* L_si_to_sf || L_si_to_df */
-+
-+#if defined(L_usi_to_sf) || defined(L_usi_to_df) || defined(L_usi_to_tf)
-+FLO_type
-+usi_to_float (USItype arg_a)
-+{
-+ fp_number_type in;
-+
-+ in.sign = 0;
-+ if (!arg_a)
-+ {
-+ in.class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ in.class = CLASS_NUMBER;
-+ in.normal_exp = FRACBITS + NGARDS;
-+ in.fraction.ll = arg_a;
-+
-+ while (in.fraction.ll > ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll >>= 1;
-+ in.normal_exp += 1;
-+ }
-+ while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll <<= 1;
-+ in.normal_exp -= 1;
-+ }
-+ }
-+ return pack_d (&in);
-+}
-+#endif
-+
-+#if defined(L_sf_to_si) || defined(L_df_to_si) || defined(L_tf_to_si)
-+SItype
-+float_to_si (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ SItype tmp;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ if (iszero (&a))
-+ return 0;
-+ if (isnan (&a))
-+ return 0;
-+ /* get reasonable MAX_SI_INT... */
-+ if (isinf (&a))
-+ return a.sign ? (-MAX_SI_INT)-1 : MAX_SI_INT;
-+ /* it is a number, but a small one */
-+ if (a.normal_exp < 0)
-+ return 0;
-+ if (a.normal_exp > BITS_PER_SI - 2)
-+ return a.sign ? (-MAX_SI_INT)-1 : MAX_SI_INT;
-+ tmp = a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
-+ return a.sign ? (-tmp) : (tmp);
-+}
-+#endif /* L_sf_to_si || L_df_to_si */
-+
-+#if defined(L_sf_to_usi) || defined(L_df_to_usi) || defined(L_tf_to_usi)
-+#if defined US_SOFTWARE_GOFAST || defined(L_tf_to_usi)
-+/* While libgcc2.c defines its own __fixunssfsi and __fixunsdfsi routines,
-+ we also define them for GOFAST because the ones in libgcc2.c have the
-+ wrong names and I'd rather define these here and keep GOFAST CYG-LOC's
-+ out of libgcc2.c. We can't define these here if not GOFAST because then
-+ there'd be duplicate copies. */
-+
-+USItype
-+float_to_usi (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ if (iszero (&a))
-+ return 0;
-+ if (isnan (&a))
-+ return 0;
-+ /* it is a negative number */
-+ if (a.sign)
-+ return 0;
-+ /* get reasonable MAX_USI_INT... */
-+ if (isinf (&a))
-+ return MAX_USI_INT;
-+ /* it is a number, but a small one */
-+ if (a.normal_exp < 0)
-+ return 0;
-+ if (a.normal_exp > BITS_PER_SI - 1)
-+ return MAX_USI_INT;
-+ else if (a.normal_exp > (FRACBITS + NGARDS))
-+ return a.fraction.ll << (a.normal_exp - (FRACBITS + NGARDS));
-+ else
-+ return a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
-+}
-+#endif /* US_SOFTWARE_GOFAST */
-+#endif /* L_sf_to_usi || L_df_to_usi */
-+
-+#if defined(L_negate_sf) || defined(L_negate_df) || defined(L_negate_tf)
-+FLO_type
-+negate (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ flip_sign (&a);
-+ return pack_d (&a);
-+}
-+#endif /* L_negate_sf || L_negate_df */
-+
-+#ifdef FLOAT
-+
-+#if defined(L_make_sf)
-+SFtype
-+__make_fp(fp_class_type class,
-+ unsigned int sign,
-+ int exp,
-+ USItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_sf */
-+
-+#ifndef FLOAT_ONLY
-+
-+/* This enables one to build an fp library that supports float but not double.
-+ Otherwise, we would get an undefined reference to __make_dp.
-+ This is needed for some 8-bit ports that can't handle well values that
-+ are 8-bytes in size, so we just don't support double for them at all. */
-+
-+#if defined(L_sf_to_df)
-+DFtype
-+sf_to_df (SFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_dp (in.class, in.sign, in.normal_exp,
-+ ((UDItype) in.fraction.ll) << F_D_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#if defined(L_sf_to_tf) && defined(TMODES)
-+TFtype
-+sf_to_tf (SFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_tp (in.class, in.sign, in.normal_exp,
-+ ((UTItype) in.fraction.ll) << F_T_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#endif /* ! FLOAT_ONLY */
-+#endif /* FLOAT */
-+
-+#ifndef FLOAT
-+
-+extern SFtype __make_fp (fp_class_type, unsigned int, int, USItype);
-+
-+#if defined(L_make_df)
-+DFtype
-+__make_dp (fp_class_type class, unsigned int sign, int exp, UDItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_df */
-+
-+#if defined(L_df_to_sf)
-+SFtype
-+df_to_sf (DFtype arg_a)
-+{
-+ fp_number_type in;
-+ USItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> F_D_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((USItype) 1 << F_D_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_fp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_df_to_sf */
-+
-+#if defined(L_df_to_tf) && defined(TMODES) \
-+ && !defined(FLOAT) && !defined(TFLOAT)
-+TFtype
-+df_to_tf (DFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_tp (in.class, in.sign, in.normal_exp,
-+ ((UTItype) in.fraction.ll) << D_T_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#ifdef TFLOAT
-+#if defined(L_make_tf)
-+TFtype
-+__make_tp(fp_class_type class,
-+ unsigned int sign,
-+ int exp,
-+ UTItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_tf */
-+
-+#if defined(L_tf_to_df)
-+DFtype
-+tf_to_df (TFtype arg_a)
-+{
-+ fp_number_type in;
-+ UDItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> D_T_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((UTItype) 1 << D_T_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_dp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_tf_to_df */
-+
-+#if defined(L_tf_to_sf)
-+SFtype
-+tf_to_sf (TFtype arg_a)
-+{
-+ fp_number_type in;
-+ USItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> F_T_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((UTItype) 1 << F_T_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_fp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_tf_to_sf */
-+#endif /* TFLOAT */
-+
-+#endif /* ! FLOAT */
-+#endif /* !EXTENDED_FLOAT_STUBS */
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2-fp-bit.c gcc-3.4.6/gcc/config/nios2/nios2-fp-bit.c
---- gcc-3.4.6.orig/gcc/config/nios2/nios2-fp-bit.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2-fp-bit.c 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,1652 @@
-+#define FLOAT
-+/* This is a software floating point library which can be used
-+ for targets without hardware floating point.
-+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004
-+ Free Software Foundation, Inc.
-+
-+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 other files,
-+ some of which are compiled with GCC, to produce an executable,
-+ this library does not by itself 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. */
-+
-+/* This implements IEEE 754 format arithmetic, but does not provide a
-+ mechanism for setting the rounding mode, or for generating or handling
-+ exceptions.
-+
-+ The original code by Steve Chamberlain, hacked by Mark Eichin and Jim
-+ Wilson, all of Cygnus Support. */
-+
-+/* The intended way to use this file is to make two copies, add `#define FLOAT'
-+ to one copy, then compile both copies and add them to libgcc.a. */
-+
-+#include "tconfig.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+#include "config/fp-bit.h"
-+
-+/* The following macros can be defined to change the behavior of this file:
-+ FLOAT: Implement a `float', aka SFmode, fp library. If this is not
-+ defined, then this file implements a `double', aka DFmode, fp library.
-+ FLOAT_ONLY: Used with FLOAT, to implement a `float' only library, i.e.
-+ don't include float->double conversion which requires the double library.
-+ This is useful only for machines which can't support doubles, e.g. some
-+ 8-bit processors.
-+ CMPtype: Specify the type that floating point compares should return.
-+ This defaults to SItype, aka int.
-+ US_SOFTWARE_GOFAST: This makes all entry points use the same names as the
-+ US Software goFast library.
-+ _DEBUG_BITFLOAT: This makes debugging the code a little easier, by adding
-+ two integers to the FLO_union_type.
-+ NO_DENORMALS: Disable handling of denormals.
-+ NO_NANS: Disable nan and infinity handling
-+ SMALL_MACHINE: Useful when operations on QIs and HIs are faster
-+ than on an SI */
-+
-+/* We don't currently support extended floats (long doubles) on machines
-+ without hardware to deal with them.
-+
-+ These stubs are just to keep the linker from complaining about unresolved
-+ references which can be pulled in from libio & libstdc++, even if the
-+ user isn't using long doubles. However, they may generate an unresolved
-+ external to abort if abort is not used by the function, and the stubs
-+ are referenced from within libc, since libgcc goes before and after the
-+ system library. */
-+
-+#ifdef DECLARE_LIBRARY_RENAMES
-+ DECLARE_LIBRARY_RENAMES
-+#endif
-+
-+#ifdef EXTENDED_FLOAT_STUBS
-+extern void abort (void);
-+void __extendsfxf2 (void) { abort(); }
-+void __extenddfxf2 (void) { abort(); }
-+void __truncxfdf2 (void) { abort(); }
-+void __truncxfsf2 (void) { abort(); }
-+void __fixxfsi (void) { abort(); }
-+void __floatsixf (void) { abort(); }
-+void __addxf3 (void) { abort(); }
-+void __subxf3 (void) { abort(); }
-+void __mulxf3 (void) { abort(); }
-+void __divxf3 (void) { abort(); }
-+void __negxf2 (void) { abort(); }
-+void __eqxf2 (void) { abort(); }
-+void __nexf2 (void) { abort(); }
-+void __gtxf2 (void) { abort(); }
-+void __gexf2 (void) { abort(); }
-+void __lexf2 (void) { abort(); }
-+void __ltxf2 (void) { abort(); }
-+
-+void __extendsftf2 (void) { abort(); }
-+void __extenddftf2 (void) { abort(); }
-+void __trunctfdf2 (void) { abort(); }
-+void __trunctfsf2 (void) { abort(); }
-+void __fixtfsi (void) { abort(); }
-+void __floatsitf (void) { abort(); }
-+void __addtf3 (void) { abort(); }
-+void __subtf3 (void) { abort(); }
-+void __multf3 (void) { abort(); }
-+void __divtf3 (void) { abort(); }
-+void __negtf2 (void) { abort(); }
-+void __eqtf2 (void) { abort(); }
-+void __netf2 (void) { abort(); }
-+void __gttf2 (void) { abort(); }
-+void __getf2 (void) { abort(); }
-+void __letf2 (void) { abort(); }
-+void __lttf2 (void) { abort(); }
-+#else /* !EXTENDED_FLOAT_STUBS, rest of file */
-+
-+/* IEEE "special" number predicates */
-+
-+#ifdef NO_NANS
-+
-+#define nan() 0
-+#define isnan(x) 0
-+#define isinf(x) 0
-+#else
-+
-+#if defined L_thenan_sf
-+const fp_number_type __thenan_sf = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined L_thenan_df
-+const fp_number_type __thenan_df = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined L_thenan_tf
-+const fp_number_type __thenan_tf = { CLASS_SNAN, 0, 0, {(fractype) 0} };
-+#elif defined TFLOAT
-+extern const fp_number_type __thenan_tf;
-+#elif defined FLOAT
-+extern const fp_number_type __thenan_sf;
-+#else
-+extern const fp_number_type __thenan_df;
-+#endif
-+
-+INLINE
-+static fp_number_type *
-+nan (void)
-+{
-+ /* Discard the const qualifier... */
-+#ifdef TFLOAT
-+ return (fp_number_type *) (& __thenan_tf);
-+#elif defined FLOAT
-+ return (fp_number_type *) (& __thenan_sf);
-+#else
-+ return (fp_number_type *) (& __thenan_df);
-+#endif
-+}
-+
-+INLINE
-+static int
-+isnan ( fp_number_type * x)
-+{
-+ return x->class == CLASS_SNAN || x->class == CLASS_QNAN;
-+}
-+
-+INLINE
-+static int
-+isinf ( fp_number_type * x)
-+{
-+ return x->class == CLASS_INFINITY;
-+}
-+
-+#endif /* NO_NANS */
-+
-+INLINE
-+static int
-+iszero ( fp_number_type * x)
-+{
-+ return x->class == CLASS_ZERO;
-+}
-+
-+INLINE
-+static void
-+flip_sign ( fp_number_type * x)
-+{
-+ x->sign = !x->sign;
-+}
-+
-+extern FLO_type pack_d ( fp_number_type * );
-+
-+#if defined(L_pack_df) || defined(L_pack_sf) || defined(L_pack_tf)
-+FLO_type
-+pack_d ( fp_number_type * src)
-+{
-+ FLO_union_type dst;
-+ fractype fraction = src->fraction.ll; /* wasn't unsigned before? */
-+ int sign = src->sign;
-+ int exp = 0;
-+
-+ if (LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && (isnan (src) || isinf (src)))
-+ {
-+ /* We can't represent these values accurately. By using the
-+ largest possible magnitude, we guarantee that the conversion
-+ of infinity is at least as big as any finite number. */
-+ exp = EXPMAX;
-+ fraction = ((fractype) 1 << FRACBITS) - 1;
-+ }
-+ else if (isnan (src))
-+ {
-+ exp = EXPMAX;
-+ if (src->class == CLASS_QNAN || 1)
-+ {
-+#ifdef QUIET_NAN_NEGATED
-+ fraction |= QUIET_NAN - 1;
-+#else
-+ fraction |= QUIET_NAN;
-+#endif
-+ }
-+ }
-+ else if (isinf (src))
-+ {
-+ exp = EXPMAX;
-+ fraction = 0;
-+ }
-+ else if (iszero (src))
-+ {
-+ exp = 0;
-+ fraction = 0;
-+ }
-+ else if (fraction == 0)
-+ {
-+ exp = 0;
-+ }
-+ else
-+ {
-+ if (src->normal_exp < NORMAL_EXPMIN)
-+ {
-+#ifdef NO_DENORMALS
-+ /* Go straight to a zero representation if denormals are not
-+ supported. The denormal handling would be harmless but
-+ isn't unnecessary. */
-+ exp = 0;
-+ fraction = 0;
-+#else /* NO_DENORMALS */
-+ /* This number's exponent is too low to fit into the bits
-+ available in the number, so we'll store 0 in the exponent and
-+ shift the fraction to the right to make up for it. */
-+
-+ int shift = NORMAL_EXPMIN - src->normal_exp;
-+
-+ exp = 0;
-+
-+ if (shift > FRAC_NBITS - NGARDS)
-+ {
-+ /* No point shifting, since it's more that 64 out. */
-+ fraction = 0;
-+ }
-+ else
-+ {
-+ int lowbit = (fraction & (((fractype)1 << shift) - 1)) ? 1 : 0;
-+ fraction = (fraction >> shift) | lowbit;
-+ }
-+ if ((fraction & GARDMASK) == GARDMSB)
-+ {
-+ if ((fraction & (1 << NGARDS)))
-+ fraction += GARDROUND + 1;
-+ }
-+ else
-+ {
-+ /* Add to the guards to round up. */
-+ fraction += GARDROUND;
-+ }
-+ /* Perhaps the rounding means we now need to change the
-+ exponent, because the fraction is no longer denormal. */
-+ if (fraction >= IMPLICIT_1)
-+ {
-+ exp += 1;
-+ }
-+ fraction >>= NGARDS;
-+#endif /* NO_DENORMALS */
-+ }
-+ else if (!LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS)
-+ && src->normal_exp > EXPBIAS)
-+ {
-+ exp = EXPMAX;
-+ fraction = 0;
-+ }
-+ else
-+ {
-+ exp = src->normal_exp + EXPBIAS;
-+ if (!ROUND_TOWARDS_ZERO)
-+ {
-+ /* IF the gard bits are the all zero, but the first, then we're
-+ half way between two numbers, choose the one which makes the
-+ lsb of the answer 0. */
-+ if ((fraction & GARDMASK) == GARDMSB)
-+ {
-+ if (fraction & (1 << NGARDS))
-+ fraction += GARDROUND + 1;
-+ }
-+ else
-+ {
-+ /* Add a one to the guards to round up */
-+ fraction += GARDROUND;
-+ }
-+ if (fraction >= IMPLICIT_2)
-+ {
-+ fraction >>= 1;
-+ exp += 1;
-+ }
-+ }
-+ fraction >>= NGARDS;
-+
-+ if (LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && exp > EXPMAX)
-+ {
-+ /* Saturate on overflow. */
-+ exp = EXPMAX;
-+ fraction = ((fractype) 1 << FRACBITS) - 1;
-+ }
-+ }
-+ }
-+
-+ /* We previously used bitfields to store the number, but this doesn't
-+ handle little/big endian systems conveniently, so use shifts and
-+ masks */
-+#ifdef FLOAT_BIT_ORDER_MISMATCH
-+ dst.bits.fraction = fraction;
-+ dst.bits.exp = exp;
-+ dst.bits.sign = sign;
-+#else
-+# if defined TFLOAT && defined HALFFRACBITS
-+ {
-+ halffractype high, low, unity;
-+ int lowsign, lowexp;
-+
-+ unity = (halffractype) 1 << HALFFRACBITS;
-+
-+ /* Set HIGH to the high double's significand, masking out the implicit 1.
-+ Set LOW to the low double's full significand. */
-+ high = (fraction >> (FRACBITS - HALFFRACBITS)) & (unity - 1);
-+ low = fraction & (unity * 2 - 1);
-+
-+ /* Get the initial sign and exponent of the low double. */
-+ lowexp = exp - HALFFRACBITS - 1;
-+ lowsign = sign;
-+
-+ /* HIGH should be rounded like a normal double, making |LOW| <=
-+ 0.5 ULP of HIGH. Assume round-to-nearest. */
-+ if (exp < EXPMAX)
-+ if (low > unity || (low == unity && (high & 1) == 1))
-+ {
-+ /* Round HIGH up and adjust LOW to match. */
-+ high++;
-+ if (high == unity)
-+ {
-+ /* May make it infinite, but that's OK. */
-+ high = 0;
-+ exp++;
-+ }
-+ low = unity * 2 - low;
-+ lowsign ^= 1;
-+ }
-+
-+ high |= (halffractype) exp << HALFFRACBITS;
-+ high |= (halffractype) sign << (HALFFRACBITS + EXPBITS);
-+
-+ if (exp == EXPMAX || exp == 0 || low == 0)
-+ low = 0;
-+ else
-+ {
-+ while (lowexp > 0 && low < unity)
-+ {
-+ low <<= 1;
-+ lowexp--;
-+ }
-+
-+ if (lowexp <= 0)
-+ {
-+ halffractype roundmsb, round;
-+ int shift;
-+
-+ shift = 1 - lowexp;
-+ roundmsb = (1 << (shift - 1));
-+ round = low & ((roundmsb << 1) - 1);
-+
-+ low >>= shift;
-+ lowexp = 0;
-+
-+ if (round > roundmsb || (round == roundmsb && (low & 1) == 1))
-+ {
-+ low++;
-+ if (low == unity)
-+ /* LOW rounds up to the smallest normal number. */
-+ lowexp++;
-+ }
-+ }
-+
-+ low &= unity - 1;
-+ low |= (halffractype) lowexp << HALFFRACBITS;
-+ low |= (halffractype) lowsign << (HALFFRACBITS + EXPBITS);
-+ }
-+ dst.value_raw = ((fractype) high << HALFSHIFT) | low;
-+ }
-+# else
-+ dst.value_raw = fraction & ((((fractype)1) << FRACBITS) - (fractype)1);
-+ dst.value_raw |= ((fractype) (exp & ((1 << EXPBITS) - 1))) << FRACBITS;
-+ dst.value_raw |= ((fractype) (sign & 1)) << (FRACBITS | EXPBITS);
-+# endif
-+#endif
-+
-+#if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT)
-+#ifdef TFLOAT
-+ {
-+ qrtrfractype tmp1 = dst.words[0];
-+ qrtrfractype tmp2 = dst.words[1];
-+ dst.words[0] = dst.words[3];
-+ dst.words[1] = dst.words[2];
-+ dst.words[2] = tmp2;
-+ dst.words[3] = tmp1;
-+ }
-+#else
-+ {
-+ halffractype tmp = dst.words[0];
-+ dst.words[0] = dst.words[1];
-+ dst.words[1] = tmp;
-+ }
-+#endif
-+#endif
-+
-+ return dst.value;
-+}
-+#endif
-+
-+#if defined(L_unpack_df) || defined(L_unpack_sf) || defined(L_unpack_tf)
-+void
-+unpack_d (FLO_union_type * src, fp_number_type * dst)
-+{
-+ /* We previously used bitfields to store the number, but this doesn't
-+ handle little/big endian systems conveniently, so use shifts and
-+ masks */
-+ fractype fraction;
-+ int exp;
-+ int sign;
-+
-+#if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT)
-+ FLO_union_type swapped;
-+
-+#ifdef TFLOAT
-+ swapped.words[0] = src->words[3];
-+ swapped.words[1] = src->words[2];
-+ swapped.words[2] = src->words[1];
-+ swapped.words[3] = src->words[0];
-+#else
-+ swapped.words[0] = src->words[1];
-+ swapped.words[1] = src->words[0];
-+#endif
-+ src = &swapped;
-+#endif
-+
-+#ifdef FLOAT_BIT_ORDER_MISMATCH
-+ fraction = src->bits.fraction;
-+ exp = src->bits.exp;
-+ sign = src->bits.sign;
-+#else
-+# if defined TFLOAT && defined HALFFRACBITS
-+ {
-+ halffractype high, low;
-+
-+ high = src->value_raw >> HALFSHIFT;
-+ low = src->value_raw & (((fractype)1 << HALFSHIFT) - 1);
-+
-+ fraction = high & ((((fractype)1) << HALFFRACBITS) - 1);
-+ fraction <<= FRACBITS - HALFFRACBITS;
-+ exp = ((int)(high >> HALFFRACBITS)) & ((1 << EXPBITS) - 1);
-+ sign = ((int)(high >> (((HALFFRACBITS + EXPBITS))))) & 1;
-+
-+ if (exp != EXPMAX && exp != 0 && low != 0)
-+ {
-+ int lowexp = ((int)(low >> HALFFRACBITS)) & ((1 << EXPBITS) - 1);
-+ int lowsign = ((int)(low >> (((HALFFRACBITS + EXPBITS))))) & 1;
-+ int shift;
-+ fractype xlow;
-+
-+ xlow = low & ((((fractype)1) << HALFFRACBITS) - 1);
-+ if (lowexp)
-+ xlow |= (((halffractype)1) << HALFFRACBITS);
-+ else
-+ lowexp = 1;
-+ shift = (FRACBITS - HALFFRACBITS) - (exp - lowexp);
-+ if (shift > 0)
-+ xlow <<= shift;
-+ else if (shift < 0)
-+ xlow >>= -shift;
-+ if (sign == lowsign)
-+ fraction += xlow;
-+ else if (fraction >= xlow)
-+ fraction -= xlow;
-+ else
-+ {
-+ /* The high part is a power of two but the full number is lower.
-+ This code will leave the implicit 1 in FRACTION, but we'd
-+ have added that below anyway. */
-+ fraction = (((fractype) 1 << FRACBITS) - xlow) << 1;
-+ exp--;
-+ }
-+ }
-+ }
-+# else
-+ fraction = src->value_raw & ((((fractype)1) << FRACBITS) - 1);
-+ exp = ((int)(src->value_raw >> FRACBITS)) & ((1 << EXPBITS) - 1);
-+ sign = ((int)(src->value_raw >> (FRACBITS + EXPBITS))) & 1;
-+# endif
-+#endif
-+
-+ dst->sign = sign;
-+ if (exp == 0)
-+ {
-+ /* Hmm. Looks like 0 */
-+ if (fraction == 0
-+#ifdef NO_DENORMALS
-+ || 1
-+#endif
-+ )
-+ {
-+ /* tastes like zero */
-+ dst->class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ /* Zero exponent with nonzero fraction - it's denormalized,
-+ so there isn't a leading implicit one - we'll shift it so
-+ it gets one. */
-+ dst->normal_exp = exp - EXPBIAS + 1;
-+ fraction <<= NGARDS;
-+
-+ dst->class = CLASS_NUMBER;
-+#if 1
-+ while (fraction < IMPLICIT_1)
-+ {
-+ fraction <<= 1;
-+ dst->normal_exp--;
-+ }
-+#endif
-+ dst->fraction.ll = fraction;
-+ }
-+ }
-+ else if (!LARGEST_EXPONENT_IS_NORMAL (FRAC_NBITS) && exp == EXPMAX)
-+ {
-+ /* Huge exponent*/
-+ if (fraction == 0)
-+ {
-+ /* Attached to a zero fraction - means infinity */
-+ dst->class = CLASS_INFINITY;
-+ }
-+ else
-+ {
-+ /* Nonzero fraction, means nan */
-+#ifdef QUIET_NAN_NEGATED
-+ if ((fraction & QUIET_NAN) == 0)
-+#else
-+ if (fraction & QUIET_NAN)
-+#endif
-+ {
-+ dst->class = CLASS_QNAN;
-+ }
-+ else
-+ {
-+ dst->class = CLASS_SNAN;
-+ }
-+ /* Keep the fraction part as the nan number */
-+ dst->fraction.ll = fraction;
-+ }
-+ }
-+ else
-+ {
-+ /* Nothing strange about this number */
-+ dst->normal_exp = exp - EXPBIAS;
-+ dst->class = CLASS_NUMBER;
-+ dst->fraction.ll = (fraction << NGARDS) | IMPLICIT_1;
-+ }
-+}
-+#endif /* L_unpack_df || L_unpack_sf */
-+
-+#if defined(L_addsub_sf) || defined(L_addsub_df) || defined(L_addsub_tf)
-+static fp_number_type *
-+_fpadd_parts (fp_number_type * a,
-+ fp_number_type * b,
-+ fp_number_type * tmp)
-+{
-+ intfrac tfraction;
-+
-+ /* Put commonly used fields in local variables. */
-+ int a_normal_exp;
-+ int b_normal_exp;
-+ fractype a_fraction;
-+ fractype b_fraction;
-+
-+ if (isnan (a))
-+ {
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ return b;
-+ }
-+ if (isinf (a))
-+ {
-+ /* Adding infinities with opposite signs yields a NaN. */
-+ if (isinf (b) && a->sign != b->sign)
-+ return nan ();
-+ return a;
-+ }
-+ if (isinf (b))
-+ {
-+ return b;
-+ }
-+ if (iszero (b))
-+ {
-+ if (iszero (a))
-+ {
-+ *tmp = *a;
-+ tmp->sign = a->sign & b->sign;
-+ return tmp;
-+ }
-+ return a;
-+ }
-+ if (iszero (a))
-+ {
-+ return b;
-+ }
-+
-+ /* Got two numbers. shift the smaller and increment the exponent till
-+ they're the same */
-+ {
-+ int diff;
-+
-+ a_normal_exp = a->normal_exp;
-+ b_normal_exp = b->normal_exp;
-+ a_fraction = a->fraction.ll;
-+ b_fraction = b->fraction.ll;
-+
-+ diff = a_normal_exp - b_normal_exp;
-+
-+ if (diff < 0)
-+ diff = -diff;
-+ if (diff < FRAC_NBITS)
-+ {
-+ /* ??? This does shifts one bit at a time. Optimize. */
-+ while (a_normal_exp > b_normal_exp)
-+ {
-+ b_normal_exp++;
-+ LSHIFT (b_fraction);
-+ }
-+ while (b_normal_exp > a_normal_exp)
-+ {
-+ a_normal_exp++;
-+ LSHIFT (a_fraction);
-+ }
-+ }
-+ else
-+ {
-+ /* Somethings's up.. choose the biggest */
-+ if (a_normal_exp > b_normal_exp)
-+ {
-+ b_normal_exp = a_normal_exp;
-+ b_fraction = 0;
-+ }
-+ else
-+ {
-+ a_normal_exp = b_normal_exp;
-+ a_fraction = 0;
-+ }
-+ }
-+ }
-+
-+ if (a->sign != b->sign)
-+ {
-+ if (a->sign)
-+ {
-+ tfraction = -a_fraction + b_fraction;
-+ }
-+ else
-+ {
-+ tfraction = a_fraction - b_fraction;
-+ }
-+ if (tfraction >= 0)
-+ {
-+ tmp->sign = 0;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = tfraction;
-+ }
-+ else
-+ {
-+ tmp->sign = 1;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = -tfraction;
-+ }
-+ /* and renormalize it */
-+
-+ while (tmp->fraction.ll < IMPLICIT_1 && tmp->fraction.ll)
-+ {
-+ tmp->fraction.ll <<= 1;
-+ tmp->normal_exp--;
-+ }
-+ }
-+ else
-+ {
-+ tmp->sign = a->sign;
-+ tmp->normal_exp = a_normal_exp;
-+ tmp->fraction.ll = a_fraction + b_fraction;
-+ }
-+ tmp->class = CLASS_NUMBER;
-+ /* Now the fraction is added, we have to shift down to renormalize the
-+ number */
-+
-+ if (tmp->fraction.ll >= IMPLICIT_2)
-+ {
-+ LSHIFT (tmp->fraction.ll);
-+ tmp->normal_exp++;
-+ }
-+ return tmp;
-+
-+}
-+
-+FLO_type
-+add (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpadd_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+
-+FLO_type
-+sub (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ b.sign ^= 1;
-+
-+ res = _fpadd_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_addsub_sf || L_addsub_df */
-+
-+#if defined(L_mul_sf) || defined(L_mul_df) || defined(L_mul_tf)
-+static inline __attribute__ ((__always_inline__)) fp_number_type *
-+_fpmul_parts ( fp_number_type * a,
-+ fp_number_type * b,
-+ fp_number_type * tmp)
-+{
-+ fractype low = 0;
-+ fractype high = 0;
-+
-+ if (isnan (a))
-+ {
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+ if (isinf (a))
-+ {
-+ if (iszero (b))
-+ return nan ();
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (isinf (b))
-+ {
-+ if (iszero (a))
-+ {
-+ return nan ();
-+ }
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+ if (iszero (a))
-+ {
-+ a->sign = a->sign != b->sign;
-+ return a;
-+ }
-+ if (iszero (b))
-+ {
-+ b->sign = a->sign != b->sign;
-+ return b;
-+ }
-+
-+ /* Calculate the mantissa by multiplying both numbers to get a
-+ twice-as-wide number. */
-+ {
-+#if defined(NO_DI_MODE) || defined(TFLOAT)
-+ {
-+ fractype x = a->fraction.ll;
-+ fractype ylow = b->fraction.ll;
-+ fractype yhigh = 0;
-+ int bit;
-+
-+ /* ??? This does multiplies one bit at a time. Optimize. */
-+ for (bit = 0; bit < FRAC_NBITS; bit++)
-+ {
-+ int carry;
-+
-+ if (x & 1)
-+ {
-+ carry = (low += ylow) < ylow;
-+ high += yhigh + carry;
-+ }
-+ yhigh <<= 1;
-+ if (ylow & FRACHIGH)
-+ {
-+ yhigh |= 1;
-+ }
-+ ylow <<= 1;
-+ x >>= 1;
-+ }
-+ }
-+#elif defined(FLOAT)
-+ /* Multiplying two USIs to get a UDI, we're safe. */
-+ {
-+ UDItype answer = (UDItype)a->fraction.ll * (UDItype)b->fraction.ll;
-+
-+ high = answer >> BITS_PER_SI;
-+ low = answer;
-+ }
-+#else
-+ /* fractype is DImode, but we need the result to be twice as wide.
-+ Assuming a widening multiply from DImode to TImode is not
-+ available, build one by hand. */
-+ {
-+ USItype nl = a->fraction.ll;
-+ USItype nh = a->fraction.ll >> BITS_PER_SI;
-+ USItype ml = b->fraction.ll;
-+ USItype mh = b->fraction.ll >> BITS_PER_SI;
-+ UDItype pp_ll = (UDItype) ml * nl;
-+ UDItype pp_hl = (UDItype) mh * nl;
-+ UDItype pp_lh = (UDItype) ml * nh;
-+ UDItype pp_hh = (UDItype) mh * nh;
-+ UDItype res2 = 0;
-+ UDItype res0 = 0;
-+ UDItype ps_hh__ = pp_hl + pp_lh;
-+ if (ps_hh__ < pp_hl)
-+ res2 += (UDItype)1 << BITS_PER_SI;
-+ pp_hl = (UDItype)(USItype)ps_hh__ << BITS_PER_SI;
-+ res0 = pp_ll + pp_hl;
-+ if (res0 < pp_ll)
-+ res2++;
-+ res2 += (ps_hh__ >> BITS_PER_SI) + pp_hh;
-+ high = res2;
-+ low = res0;
-+ }
-+#endif
-+ }
-+
-+ tmp->normal_exp = a->normal_exp + b->normal_exp
-+ + FRAC_NBITS - (FRACBITS + NGARDS);
-+ tmp->sign = a->sign != b->sign;
-+ while (high >= IMPLICIT_2)
-+ {
-+ tmp->normal_exp++;
-+ if (high & 1)
-+ {
-+ low >>= 1;
-+ low |= FRACHIGH;
-+ }
-+ high >>= 1;
-+ }
-+ while (high < IMPLICIT_1)
-+ {
-+ tmp->normal_exp--;
-+
-+ high <<= 1;
-+ if (low & FRACHIGH)
-+ high |= 1;
-+ low <<= 1;
-+ }
-+ /* rounding is tricky. if we only round if it won't make us round later. */
-+#if 0
-+ if (low & FRACHIGH2)
-+ {
-+ if (((high & GARDMASK) != GARDMSB)
-+ && (((high + 1) & GARDMASK) == GARDMSB))
-+ {
-+ /* don't round, it gets done again later. */
-+ }
-+ else
-+ {
-+ high++;
-+ }
-+ }
-+#endif
-+ if (!ROUND_TOWARDS_ZERO && (high & GARDMASK) == GARDMSB)
-+ {
-+ if (high & (1 << NGARDS))
-+ {
-+ /* half way, so round to even */
-+ high += GARDROUND + 1;
-+ }
-+ else if (low)
-+ {
-+ /* but we really weren't half way */
-+ high += GARDROUND + 1;
-+ }
-+ }
-+ tmp->fraction.ll = high;
-+ tmp->class = CLASS_NUMBER;
-+ return tmp;
-+}
-+
-+FLO_type
-+multiply (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type tmp;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpmul_parts (&a, &b, &tmp);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_mul_sf || L_mul_df */
-+
-+#if defined(L_div_sf) || defined(L_div_df) || defined(L_div_tf)
-+static inline __attribute__ ((__always_inline__)) fp_number_type *
-+_fpdiv_parts (fp_number_type * a,
-+ fp_number_type * b)
-+{
-+ fractype bit;
-+ fractype numerator;
-+ fractype denominator;
-+ fractype quotient;
-+
-+ if (isnan (a))
-+ {
-+ return a;
-+ }
-+ if (isnan (b))
-+ {
-+ return b;
-+ }
-+
-+ a->sign = a->sign ^ b->sign;
-+
-+ if (isinf (a) || iszero (a))
-+ {
-+ if (a->class == b->class)
-+ return nan ();
-+ return a;
-+ }
-+
-+ if (isinf (b))
-+ {
-+ a->fraction.ll = 0;
-+ a->normal_exp = 0;
-+ return a;
-+ }
-+ if (iszero (b))
-+ {
-+ a->class = CLASS_INFINITY;
-+ return a;
-+ }
-+
-+ /* Calculate the mantissa by multiplying both 64bit numbers to get a
-+ 128 bit number */
-+ {
-+ /* quotient =
-+ ( numerator / denominator) * 2^(numerator exponent - denominator exponent)
-+ */
-+
-+ a->normal_exp = a->normal_exp - b->normal_exp;
-+ numerator = a->fraction.ll;
-+ denominator = b->fraction.ll;
-+
-+ if (numerator < denominator)
-+ {
-+ /* Fraction will be less than 1.0 */
-+ numerator *= 2;
-+ a->normal_exp--;
-+ }
-+ bit = IMPLICIT_1;
-+ quotient = 0;
-+ /* ??? Does divide one bit at a time. Optimize. */
-+ while (bit)
-+ {
-+ if (numerator >= denominator)
-+ {
-+ quotient |= bit;
-+ numerator -= denominator;
-+ }
-+ bit >>= 1;
-+ numerator *= 2;
-+ }
-+
-+ if (!ROUND_TOWARDS_ZERO && (quotient & GARDMASK) == GARDMSB)
-+ {
-+ if (quotient & (1 << NGARDS))
-+ {
-+ /* half way, so round to even */
-+ quotient += GARDROUND + 1;
-+ }
-+ else if (numerator)
-+ {
-+ /* but we really weren't half way, more bits exist */
-+ quotient += GARDROUND + 1;
-+ }
-+ }
-+
-+ a->fraction.ll = quotient;
-+ return (a);
-+ }
-+}
-+
-+FLO_type
-+divide (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ fp_number_type *res;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ res = _fpdiv_parts (&a, &b);
-+
-+ return pack_d (res);
-+}
-+#endif /* L_div_sf || L_div_df */
-+
-+#if defined(L_fpcmp_parts_sf) || defined(L_fpcmp_parts_df) \
-+ || defined(L_fpcmp_parts_tf)
-+/* according to the demo, fpcmp returns a comparison with 0... thus
-+ a<b -> -1
-+ a==b -> 0
-+ a>b -> +1
-+ */
-+
-+int
-+__fpcmp_parts (fp_number_type * a, fp_number_type * b)
-+{
-+#if 0
-+ /* either nan -> unordered. Must be checked outside of this routine. */
-+ if (isnan (a) && isnan (b))
-+ {
-+ return 1; /* still unordered! */
-+ }
-+#endif
-+
-+ if (isnan (a) || isnan (b))
-+ {
-+ return 1; /* how to indicate unordered compare? */
-+ }
-+ if (isinf (a) && isinf (b))
-+ {
-+ /* +inf > -inf, but +inf != +inf */
-+ /* b \a| +inf(0)| -inf(1)
-+ ______\+--------+--------
-+ +inf(0)| a==b(0)| a<b(-1)
-+ -------+--------+--------
-+ -inf(1)| a>b(1) | a==b(0)
-+ -------+--------+--------
-+ So since unordered must be nonzero, just line up the columns...
-+ */
-+ return b->sign - a->sign;
-+ }
-+ /* but not both... */
-+ if (isinf (a))
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (isinf (b))
-+ {
-+ return b->sign ? 1 : -1;
-+ }
-+ if (iszero (a) && iszero (b))
-+ {
-+ return 0;
-+ }
-+ if (iszero (a))
-+ {
-+ return b->sign ? 1 : -1;
-+ }
-+ if (iszero (b))
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ /* now both are "normal". */
-+ if (a->sign != b->sign)
-+ {
-+ /* opposite signs */
-+ return a->sign ? -1 : 1;
-+ }
-+ /* same sign; exponents? */
-+ if (a->normal_exp > b->normal_exp)
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (a->normal_exp < b->normal_exp)
-+ {
-+ return a->sign ? 1 : -1;
-+ }
-+ /* same exponents; check size. */
-+ if (a->fraction.ll > b->fraction.ll)
-+ {
-+ return a->sign ? -1 : 1;
-+ }
-+ if (a->fraction.ll < b->fraction.ll)
-+ {
-+ return a->sign ? 1 : -1;
-+ }
-+ /* after all that, they're equal. */
-+ return 0;
-+}
-+#endif
-+
-+#if defined(L_compare_sf) || defined(L_compare_df) || defined(L_compoare_tf)
-+CMPtype
-+compare (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_compare_sf || L_compare_df */
-+
-+#ifndef US_SOFTWARE_GOFAST
-+
-+/* These should be optimized for their specific tasks someday. */
-+
-+#if defined(L_eq_sf) || defined(L_eq_df) || defined(L_eq_tf)
-+CMPtype
-+_eq_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth == 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_eq_sf || L_eq_df */
-+
-+#if defined(L_ne_sf) || defined(L_ne_df) || defined(L_ne_tf)
-+CMPtype
-+_ne_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* true, truth != 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_ne_sf || L_ne_df */
-+
-+#if defined(L_gt_sf) || defined(L_gt_df) || defined(L_gt_tf)
-+CMPtype
-+_gt_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return -1; /* false, truth > 0 */
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_gt_sf || L_gt_df */
-+
-+#if defined(L_ge_sf) || defined(L_ge_df) || defined(L_ge_tf)
-+CMPtype
-+_ge_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return -1; /* false, truth >= 0 */
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_ge_sf || L_ge_df */
-+
-+#if defined(L_lt_sf) || defined(L_lt_df) || defined(L_lt_tf)
-+CMPtype
-+_lt_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth < 0 */
-+
-+ return __fpcmp_parts (&a, &b);
-+}
-+#endif /* L_lt_sf || L_lt_df */
-+
-+#if defined(L_le_sf) || defined(L_le_df) || defined(L_le_tf)
-+CMPtype
-+_le_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ if (isnan (&a) || isnan (&b))
-+ return 1; /* false, truth <= 0 */
-+
-+ return __fpcmp_parts (&a, &b) ;
-+}
-+#endif /* L_le_sf || L_le_df */
-+
-+#endif /* ! US_SOFTWARE_GOFAST */
-+
-+#if defined(L_unord_sf) || defined(L_unord_df) || defined(L_unord_tf)
-+CMPtype
-+_unord_f2 (FLO_type arg_a, FLO_type arg_b)
-+{
-+ fp_number_type a;
-+ fp_number_type b;
-+ FLO_union_type au, bu;
-+
-+ au.value = arg_a;
-+ bu.value = arg_b;
-+
-+ unpack_d (&au, &a);
-+ unpack_d (&bu, &b);
-+
-+ return (isnan (&a) || isnan (&b));
-+}
-+#endif /* L_unord_sf || L_unord_df */
-+
-+#if defined(L_si_to_sf) || defined(L_si_to_df) || defined(L_si_to_tf)
-+FLO_type
-+si_to_float (SItype arg_a)
-+{
-+ fp_number_type in;
-+
-+ in.class = CLASS_NUMBER;
-+ in.sign = arg_a < 0;
-+ if (!arg_a)
-+ {
-+ in.class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ in.normal_exp = FRACBITS + NGARDS;
-+ if (in.sign)
-+ {
-+ /* Special case for minint, since there is no +ve integer
-+ representation for it */
-+ if (arg_a == (- MAX_SI_INT - 1))
-+ {
-+ return (FLO_type)(- MAX_SI_INT - 1);
-+ }
-+ in.fraction.ll = (-arg_a);
-+ }
-+ else
-+ in.fraction.ll = arg_a;
-+
-+ while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll <<= 1;
-+ in.normal_exp -= 1;
-+ }
-+ }
-+ return pack_d (&in);
-+}
-+#endif /* L_si_to_sf || L_si_to_df */
-+
-+#if defined(L_usi_to_sf) || defined(L_usi_to_df) || defined(L_usi_to_tf)
-+FLO_type
-+usi_to_float (USItype arg_a)
-+{
-+ fp_number_type in;
-+
-+ in.sign = 0;
-+ if (!arg_a)
-+ {
-+ in.class = CLASS_ZERO;
-+ }
-+ else
-+ {
-+ in.class = CLASS_NUMBER;
-+ in.normal_exp = FRACBITS + NGARDS;
-+ in.fraction.ll = arg_a;
-+
-+ while (in.fraction.ll > ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll >>= 1;
-+ in.normal_exp += 1;
-+ }
-+ while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS)))
-+ {
-+ in.fraction.ll <<= 1;
-+ in.normal_exp -= 1;
-+ }
-+ }
-+ return pack_d (&in);
-+}
-+#endif
-+
-+#if defined(L_sf_to_si) || defined(L_df_to_si) || defined(L_tf_to_si)
-+SItype
-+float_to_si (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ SItype tmp;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ if (iszero (&a))
-+ return 0;
-+ if (isnan (&a))
-+ return 0;
-+ /* get reasonable MAX_SI_INT... */
-+ if (isinf (&a))
-+ return a.sign ? (-MAX_SI_INT)-1 : MAX_SI_INT;
-+ /* it is a number, but a small one */
-+ if (a.normal_exp < 0)
-+ return 0;
-+ if (a.normal_exp > BITS_PER_SI - 2)
-+ return a.sign ? (-MAX_SI_INT)-1 : MAX_SI_INT;
-+ tmp = a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
-+ return a.sign ? (-tmp) : (tmp);
-+}
-+#endif /* L_sf_to_si || L_df_to_si */
-+
-+#if defined(L_sf_to_usi) || defined(L_df_to_usi) || defined(L_tf_to_usi)
-+#if defined US_SOFTWARE_GOFAST || defined(L_tf_to_usi)
-+/* While libgcc2.c defines its own __fixunssfsi and __fixunsdfsi routines,
-+ we also define them for GOFAST because the ones in libgcc2.c have the
-+ wrong names and I'd rather define these here and keep GOFAST CYG-LOC's
-+ out of libgcc2.c. We can't define these here if not GOFAST because then
-+ there'd be duplicate copies. */
-+
-+USItype
-+float_to_usi (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ if (iszero (&a))
-+ return 0;
-+ if (isnan (&a))
-+ return 0;
-+ /* it is a negative number */
-+ if (a.sign)
-+ return 0;
-+ /* get reasonable MAX_USI_INT... */
-+ if (isinf (&a))
-+ return MAX_USI_INT;
-+ /* it is a number, but a small one */
-+ if (a.normal_exp < 0)
-+ return 0;
-+ if (a.normal_exp > BITS_PER_SI - 1)
-+ return MAX_USI_INT;
-+ else if (a.normal_exp > (FRACBITS + NGARDS))
-+ return a.fraction.ll << (a.normal_exp - (FRACBITS + NGARDS));
-+ else
-+ return a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
-+}
-+#endif /* US_SOFTWARE_GOFAST */
-+#endif /* L_sf_to_usi || L_df_to_usi */
-+
-+#if defined(L_negate_sf) || defined(L_negate_df) || defined(L_negate_tf)
-+FLO_type
-+negate (FLO_type arg_a)
-+{
-+ fp_number_type a;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &a);
-+
-+ flip_sign (&a);
-+ return pack_d (&a);
-+}
-+#endif /* L_negate_sf || L_negate_df */
-+
-+#ifdef FLOAT
-+
-+#if defined(L_make_sf)
-+SFtype
-+__make_fp(fp_class_type class,
-+ unsigned int sign,
-+ int exp,
-+ USItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_sf */
-+
-+#ifndef FLOAT_ONLY
-+
-+/* This enables one to build an fp library that supports float but not double.
-+ Otherwise, we would get an undefined reference to __make_dp.
-+ This is needed for some 8-bit ports that can't handle well values that
-+ are 8-bytes in size, so we just don't support double for them at all. */
-+
-+#if defined(L_sf_to_df)
-+DFtype
-+sf_to_df (SFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_dp (in.class, in.sign, in.normal_exp,
-+ ((UDItype) in.fraction.ll) << F_D_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#if defined(L_sf_to_tf) && defined(TMODES)
-+TFtype
-+sf_to_tf (SFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_tp (in.class, in.sign, in.normal_exp,
-+ ((UTItype) in.fraction.ll) << F_T_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#endif /* ! FLOAT_ONLY */
-+#endif /* FLOAT */
-+
-+#ifndef FLOAT
-+
-+extern SFtype __make_fp (fp_class_type, unsigned int, int, USItype);
-+
-+#if defined(L_make_df)
-+DFtype
-+__make_dp (fp_class_type class, unsigned int sign, int exp, UDItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_df */
-+
-+#if defined(L_df_to_sf)
-+SFtype
-+df_to_sf (DFtype arg_a)
-+{
-+ fp_number_type in;
-+ USItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> F_D_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((USItype) 1 << F_D_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_fp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_df_to_sf */
-+
-+#if defined(L_df_to_tf) && defined(TMODES) \
-+ && !defined(FLOAT) && !defined(TFLOAT)
-+TFtype
-+df_to_tf (DFtype arg_a)
-+{
-+ fp_number_type in;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ return __make_tp (in.class, in.sign, in.normal_exp,
-+ ((UTItype) in.fraction.ll) << D_T_BITOFF);
-+}
-+#endif /* L_sf_to_df */
-+
-+#ifdef TFLOAT
-+#if defined(L_make_tf)
-+TFtype
-+__make_tp(fp_class_type class,
-+ unsigned int sign,
-+ int exp,
-+ UTItype frac)
-+{
-+ fp_number_type in;
-+
-+ in.class = class;
-+ in.sign = sign;
-+ in.normal_exp = exp;
-+ in.fraction.ll = frac;
-+ return pack_d (&in);
-+}
-+#endif /* L_make_tf */
-+
-+#if defined(L_tf_to_df)
-+DFtype
-+tf_to_df (TFtype arg_a)
-+{
-+ fp_number_type in;
-+ UDItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> D_T_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((UTItype) 1 << D_T_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_dp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_tf_to_df */
-+
-+#if defined(L_tf_to_sf)
-+SFtype
-+tf_to_sf (TFtype arg_a)
-+{
-+ fp_number_type in;
-+ USItype sffrac;
-+ FLO_union_type au;
-+
-+ au.value = arg_a;
-+ unpack_d (&au, &in);
-+
-+ sffrac = in.fraction.ll >> F_T_BITOFF;
-+
-+ /* We set the lowest guard bit in SFFRAC if we discarded any non
-+ zero bits. */
-+ if ((in.fraction.ll & (((UTItype) 1 << F_T_BITOFF) - 1)) != 0)
-+ sffrac |= 1;
-+
-+ return __make_fp (in.class, in.sign, in.normal_exp, sffrac);
-+}
-+#endif /* L_tf_to_sf */
-+#endif /* TFLOAT */
-+
-+#endif /* ! FLOAT */
-+#endif /* !EXTENDED_FLOAT_STUBS */
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2.h gcc-3.4.6/gcc/config/nios2/nios2.h
---- gcc-3.4.6.orig/gcc/config/nios2/nios2.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2.h 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,824 @@
-+/* Definitions of target machine for Altera NIOS 2G NIOS2 version.
-+ Copyright (C) 2003 Altera
-+ Contributed by Jonah Graham (jgraham@altera.com).
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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.
-+
-+GNU CC 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 CC; see the file COPYING. If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA. */
-+
-+
-+
-+#define TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ builtin_define_std ("NIOS2"); \
-+ builtin_define_std ("nios2"); \
-+ builtin_define ("_GNU_SOURCE"); \
-+ } \
-+ while (0)
-+#define TARGET_VERSION fprintf (stderr, " (Altera Nios II)")
-+
-+
-+
-+
-+
-+/*********************************
-+ * Run-time Target Specification
-+ *********************************/
-+
-+#define HAS_DIV_FLAG 0x0001
-+#define HAS_MUL_FLAG 0x0002
-+#define HAS_MULX_FLAG 0x0004
-+#define FAST_SW_DIV_FLAG 0x0008
-+#define INLINE_MEMCPY_FLAG 0x00010
-+#define CACHE_VOLATILE_FLAG 0x0020
-+#define BYPASS_CACHE_FLAG 0x0040
-+
-+extern int target_flags;
-+#define TARGET_HAS_DIV (target_flags & HAS_DIV_FLAG)
-+#define TARGET_HAS_MUL (target_flags & HAS_MUL_FLAG)
-+#define TARGET_HAS_MULX (target_flags & HAS_MULX_FLAG)
-+#define TARGET_FAST_SW_DIV (target_flags & FAST_SW_DIV_FLAG)
-+#define TARGET_INLINE_MEMCPY (target_flags & INLINE_MEMCPY_FLAG)
-+#define TARGET_CACHE_VOLATILE (target_flags & CACHE_VOLATILE_FLAG)
-+#define TARGET_BYPASS_CACHE (target_flags & BYPASS_CACHE_FLAG)
-+
-+#define TARGET_SWITCHES \
-+{ \
-+ { "hw-div", HAS_DIV_FLAG, \
-+ N_("Enable DIV, DIVU") }, \
-+ { "no-hw-div", -HAS_DIV_FLAG, \
-+ N_("Disable DIV, DIVU (default)") }, \
-+ { "hw-mul", HAS_MUL_FLAG, \
-+ N_("Enable MUL instructions (default)") }, \
-+ { "hw-mulx", HAS_MULX_FLAG, \
-+ N_("Enable MULX instructions, assume fast shifter") }, \
-+ { "no-hw-mul", -HAS_MUL_FLAG, \
-+ N_("Disable MUL instructions") }, \
-+ { "no-hw-mulx", -HAS_MULX_FLAG, \
-+ N_("Disable MULX instructions, assume slow shifter (default and implied by -mno-hw-mul)") }, \
-+ { "fast-sw-div", FAST_SW_DIV_FLAG, \
-+ N_("Use table based fast divide (default at -O3)") }, \
-+ { "no-fast-sw-div", -FAST_SW_DIV_FLAG, \
-+ N_("Don't use table based fast divide ever") }, \
-+ { "inline-memcpy", INLINE_MEMCPY_FLAG, \
-+ N_("Inline small memcpy (default when optimizing)") }, \
-+ { "no-inline-memcpy", -INLINE_MEMCPY_FLAG, \
-+ N_("Don't Inline small memcpy") }, \
-+ { "cache-volatile", CACHE_VOLATILE_FLAG, \
-+ N_("Volatile accesses use non-io variants of instructions (default)") }, \
-+ { "no-cache-volatile", -CACHE_VOLATILE_FLAG, \
-+ N_("Volatile accesses use io variants of instructions") }, \
-+ { "bypass-cache", BYPASS_CACHE_FLAG, \
-+ N_("All ld/st instructins use io variants") }, \
-+ { "no-bypass-cache", -BYPASS_CACHE_FLAG, \
-+ N_("All ld/st instructins do not use io variants (default)") }, \
-+ { "smallc", 0, \
-+ N_("Link with a limited version of the C library") }, \
-+ { "ctors-in-init", 0, \
-+ "" /* undocumented: N_("Link with static constructors and destructors in init") */ }, \
-+ { "", TARGET_DEFAULT, 0 } \
-+}
-+
-+
-+extern const char *nios2_sys_nosys_string; /* for -msys=nosys */
-+extern const char *nios2_sys_lib_string; /* for -msys-lib= */
-+extern const char *nios2_sys_crt0_string; /* for -msys-crt0= */
-+
-+#define TARGET_OPTIONS \
-+{ \
-+ { "sys=nosys", &nios2_sys_nosys_string, \
-+ N_("Use stub versions of OS library calls (default)"), 0}, \
-+ { "sys-lib=", &nios2_sys_lib_string, \
-+ N_("Name of System Library to link against. (Converted to a -l option)"), 0}, \
-+ { "sys-crt0=", &nios2_sys_crt0_string, \
-+ N_("Name of the startfile. (default is a crt0 for the ISS only)"), 0}, \
-+}
-+
-+
-+/* Default target_flags if no switches specified. */
-+#ifndef TARGET_DEFAULT
-+# define TARGET_DEFAULT (HAS_MUL_FLAG | CACHE_VOLATILE_FLAG)
-+#endif
-+
-+/* Switch Recognition by gcc.c. Add -G xx support */
-+#undef SWITCH_TAKES_ARG
-+#define SWITCH_TAKES_ARG(CHAR) \
-+ (DEFAULT_SWITCH_TAKES_ARG (CHAR) || (CHAR) == 'G')
-+
-+#define OVERRIDE_OPTIONS override_options ()
-+#define OPTIMIZATION_OPTIONS(LEVEL, SIZE) optimization_options (LEVEL, SIZE)
-+#define CAN_DEBUG_WITHOUT_FP
-+
-+#define CC1_SPEC "\
-+%{G*}"
-+
-+#undef LIB_SPEC
-+#define LIB_SPEC \
-+"--start-group %{msmallc: -lsmallc} %{!msmallc: -lc} -lgcc \
-+ %{msys-lib=*: -l%*} \
-+ %{!msys-lib=*: -lc } \
-+ --end-group \
-+ %{msys-lib=: %eYou need a library name for -msys-lib=} \
-+"
-+
-+
-+#undef STARTFILE_SPEC
-+#define STARTFILE_SPEC \
-+"%{msys-crt0=*: %*} %{!msys-crt0=*: crt1%O%s} \
-+ %{msys-crt0=: %eYou need a C startup file for -msys-crt0=} \
-+ %{mctors-in-init: crti%O%s crtbegin%O%s} \
-+"
-+
-+#undef ENDFILE_SPEC
-+#define ENDFILE_SPEC \
-+ "%{mctors-in-init: crtend%O%s crtn%O%s}"
-+
-+
-+/***********************
-+ * Storage Layout
-+ ***********************/
-+
-+#define DEFAULT_SIGNED_CHAR 1
-+#define BITS_BIG_ENDIAN 0
-+#define BYTES_BIG_ENDIAN 0
-+#define WORDS_BIG_ENDIAN 0
-+#define BITS_PER_UNIT 8
-+#define BITS_PER_WORD 32
-+#define UNITS_PER_WORD 4
-+#define POINTER_SIZE 32
-+#define BIGGEST_ALIGNMENT 32
-+#define STRICT_ALIGNMENT 1
-+#define FUNCTION_BOUNDARY 32
-+#define PARM_BOUNDARY 32
-+#define STACK_BOUNDARY 32
-+#define PREFERRED_STACK_BOUNDARY 32
-+#define MAX_FIXED_MODE_SIZE 64
-+
-+#define CONSTANT_ALIGNMENT(EXP, ALIGN) \
-+ ((TREE_CODE (EXP) == STRING_CST) \
-+ && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN))
-+
-+
-+/**********************
-+ * Layout of Source Language Data Types
-+ **********************/
-+
-+#define INT_TYPE_SIZE 32
-+#define SHORT_TYPE_SIZE 16
-+#define LONG_TYPE_SIZE 32
-+#define LONG_LONG_TYPE_SIZE 64
-+#define FLOAT_TYPE_SIZE 32
-+#define DOUBLE_TYPE_SIZE 64
-+#define LONG_DOUBLE_TYPE_SIZE DOUBLE_TYPE_SIZE
-+
-+
-+/*************************
-+ * Condition Code Status
-+ ************************/
-+
-+/* comparison type */
-+/* ??? currently only CMP_SI is used */
-+enum cmp_type {
-+ CMP_SI, /* compare four byte integers */
-+ CMP_DI, /* compare eight byte integers */
-+ CMP_SF, /* compare single precision floats */
-+ CMP_DF, /* compare double precision floats */
-+ CMP_MAX /* max comparison type */
-+};
-+
-+extern GTY(()) rtx branch_cmp[2]; /* operands for compare */
-+extern enum cmp_type branch_type; /* what type of branch to use */
-+
-+/**********************
-+ * Register Usage
-+ **********************/
-+
-+/* ---------------------------------- *
-+ * Basic Characteristics of Registers
-+ * ---------------------------------- */
-+
-+/*
-+Register Number
-+ Register Name
-+ Alternate Name
-+ Purpose
-+0 r0 zero always zero
-+1 r1 at Assembler Temporary
-+2-3 r2-r3 Return Location
-+4-7 r4-r7 Register Arguments
-+8-15 r8-r15 Caller Saved Registers
-+16-22 r16-r22 Callee Saved Registers
-+23 r23 sc Static Chain (Callee Saved)
-+ ??? Does $sc want to be caller or callee
-+ saved. If caller, 15, else 23.
-+24 r24 Exception Temporary
-+25 r25 Breakpoint Temporary
-+26 r26 gp Global Pointer
-+27 r27 sp Stack Pointer
-+28 r28 fp Frame Pointer
-+29 r29 ea Exception Return Address
-+30 r30 ba Breakpoint Return Address
-+31 r31 ra Return Address
-+
-+32 ctl0 status
-+33 ctl1 estatus STATUS saved by exception ?
-+34 ctl2 bstatus STATUS saved by break ?
-+35 ctl3 ipri Interrupt Priority Mask ?
-+36 ctl4 ecause Exception Cause ?
-+
-+37 pc Not an actual register
-+
-+38 rap Return address pointer, this does not
-+ actually exist and will be eliminated
-+
-+39 fake_fp Fake Frame Pointer which will always be eliminated.
-+40 fake_ap Fake Argument Pointer which will always be eliminated.
-+
-+41 First Pseudo Register
-+
-+
-+The definitions for all the hard register numbers
-+are located in nios2.md.
-+*/
-+
-+#define FIRST_PSEUDO_REGISTER 41
-+#define NUM_ARG_REGS (LAST_ARG_REGNO - FIRST_ARG_REGNO + 1)
-+
-+
-+
-+/* also see CONDITIONAL_REGISTER_USAGE */
-+#define FIXED_REGISTERS \
-+ { \
-+/* +0 1 2 3 4 5 6 7 8 9 */ \
-+/* 0 */ 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, \
-+/* 10 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-+/* 20 */ 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, \
-+/* 30 */ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, \
-+/* 40 */ 1, \
-+ }
-+
-+/* call used is the same as caller saved
-+ + fixed regs + args + ret vals */
-+#define CALL_USED_REGISTERS \
-+ { \
-+/* +0 1 2 3 4 5 6 7 8 9 */ \
-+/* 0 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-+/* 10 */ 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, \
-+/* 20 */ 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, \
-+/* 30 */ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, \
-+/* 40 */ 1, \
-+ }
-+
-+#define HARD_REGNO_NREGS(REGNO, MODE) \
-+ ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) \
-+ / UNITS_PER_WORD)
-+
-+/* --------------------------- *
-+ * How Values Fit in Registers
-+ * --------------------------- */
-+
-+#define HARD_REGNO_MODE_OK(REGNO, MODE) 1
-+
-+#define MODES_TIEABLE_P(MODE1, MODE2) 1
-+
-+
-+/*************************
-+ * Register Classes
-+ *************************/
-+
-+enum reg_class
-+{
-+ NO_REGS,
-+ ALL_REGS,
-+ LIM_REG_CLASSES
-+};
-+
-+#define N_REG_CLASSES (int) LIM_REG_CLASSES
-+
-+#define REG_CLASS_NAMES \
-+ {"NO_REGS", \
-+ "ALL_REGS"}
-+
-+#define GENERAL_REGS ALL_REGS
-+
-+#define REG_CLASS_CONTENTS \
-+/* NO_REGS */ {{ 0, 0}, \
-+/* ALL_REGS */ {~0,~0}} \
-+
-+#define REGNO_REG_CLASS(REGNO) ALL_REGS
-+
-+#define BASE_REG_CLASS ALL_REGS
-+#define INDEX_REG_CLASS ALL_REGS
-+
-+/* only one reg class, 'r', is handled automatically */
-+#define REG_CLASS_FROM_LETTER(CHAR) NO_REGS
-+
-+#define REGNO_OK_FOR_BASE_P2(REGNO, STRICT) \
-+ ((STRICT) \
-+ ? (REGNO) < FIRST_PSEUDO_REGISTER \
-+ : (REGNO) < FIRST_PSEUDO_REGISTER || (reg_renumber && reg_renumber[REGNO] < FIRST_PSEUDO_REGISTER))
-+
-+#define REGNO_OK_FOR_INDEX_P2(REGNO, STRICT) \
-+ (REGNO_OK_FOR_BASE_P2 (REGNO, STRICT))
-+
-+#define REGNO_OK_FOR_BASE_P(REGNO) \
-+ (REGNO_OK_FOR_BASE_P2 (REGNO, 1))
-+
-+#define REGNO_OK_FOR_INDEX_P(REGNO) \
-+ (REGNO_OK_FOR_INDEX_P2 (REGNO, 1))
-+
-+#define REG_OK_FOR_BASE_P2(X, STRICT) \
-+ (STRICT \
-+ ? REGNO_OK_FOR_BASE_P2 (REGNO (X), 1) \
-+ : REGNO_OK_FOR_BASE_P2 (REGNO (X), 1) || REGNO(X) >= FIRST_PSEUDO_REGISTER)
-+
-+#define REG_OK_FOR_INDEX_P2(X, STRICT) \
-+ (STRICT \
-+ ? REGNO_OK_FOR_INDEX_P2 (REGNO (X), 1) \
-+ : REGNO_OK_FOR_INDEX_P2 (REGNO (X), 1) || REGNO(X) >= FIRST_PSEUDO_REGISTER)
-+
-+#define CLASS_MAX_NREGS(CLASS, MODE) \
-+ ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) \
-+ / UNITS_PER_WORD)
-+
-+
-+#define SMALL_INT(X) ((unsigned HOST_WIDE_INT) ((X) + 0x8000) < 0x10000)
-+#define SMALL_INT_UNSIGNED(X) ((unsigned HOST_WIDE_INT) (X) < 0x10000)
-+#define UPPER16_INT(X) (((X) & 0xffff) == 0)
-+#define SHIFT_INT(X) ((X) >= 0 && (X) <= 31)
-+#define RDWRCTL_INT(X) ((X) >= 0 && (X) <= 31)
-+#define CUSTOM_INSN_OPCODE(X) ((X) >= 0 && (X) <= 255)
-+
-+#define CONST_OK_FOR_LETTER_P(VALUE, C) \
-+ ( \
-+ (C) == 'I' ? SMALL_INT (VALUE) : \
-+ (C) == 'J' ? SMALL_INT_UNSIGNED (VALUE) : \
-+ (C) == 'K' ? UPPER16_INT (VALUE) : \
-+ (C) == 'L' ? SHIFT_INT (VALUE) : \
-+ (C) == 'M' ? (VALUE) == 0 : \
-+ (C) == 'N' ? CUSTOM_INSN_OPCODE (VALUE) : \
-+ (C) == 'O' ? RDWRCTL_INT (VALUE) : \
-+ 0)
-+
-+#define CONST_DOUBLE_OK_FOR_LETTER_P(VALUE, C) 0
-+
-+#define PREFERRED_RELOAD_CLASS(X, CLASS) \
-+ ((CLASS) == NO_REGS ? GENERAL_REGS : (CLASS))
-+
-+/* 'S' matches immediates which are in small data
-+ and therefore can be added to gp to create a
-+ 32-bit value. */
-+#define EXTRA_CONSTRAINT(VALUE, C) \
-+ ((C) == 'S' \
-+ && (GET_CODE (VALUE) == SYMBOL_REF) \
-+ && SYMBOL_REF_IN_NIOS2_SMALL_DATA_P (VALUE))
-+
-+
-+
-+
-+/* Say that the epilogue uses the return address register. Note that
-+ in the case of sibcalls, the values "used by the epilogue" are
-+ considered live at the start of the called function. */
-+#define EPILOGUE_USES(REGNO) ((REGNO) == RA_REGNO)
-+
-+
-+#define DEFAULT_MAIN_RETURN c_expand_return (integer_zero_node)
-+
-+/**********************************
-+ * Trampolines for Nested Functions
-+ ***********************************/
-+
-+#define TRAMPOLINE_TEMPLATE(FILE) \
-+ error ("trampolines not yet implemented")
-+#define TRAMPOLINE_SIZE 20
-+#define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \
-+ error ("trampolines not yet implemented")
-+
-+/***************************
-+ * Stack Layout and Calling Conventions
-+ ***************************/
-+
-+/* ------------------ *
-+ * Basic Stack Layout
-+ * ------------------ */
-+
-+/* The downward variants are used by the compiler,
-+ the upward ones serve as documentation */
-+#define STACK_GROWS_DOWNWARD
-+#define FRAME_GROWS_UPWARD
-+#define ARGS_GROW_UPWARD
-+
-+#define STARTING_FRAME_OFFSET current_function_outgoing_args_size
-+#define FIRST_PARM_OFFSET(FUNDECL) 0
-+
-+/* Before the prologue, RA lives in r31. */
-+#define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (VOIDmode, RA_REGNO)
-+
-+/* -------------------------------------- *
-+ * Registers That Address the Stack Frame
-+ * -------------------------------------- */
-+
-+#define STACK_POINTER_REGNUM SP_REGNO
-+#define STATIC_CHAIN_REGNUM SC_REGNO
-+#define PC_REGNUM PC_REGNO
-+#define DWARF_FRAME_RETURN_COLUMN RA_REGNO
-+
-+/* Base register for access to local variables of the function. We
-+ pretend that the frame pointer is a non-existent hard register, and
-+ then eliminate it to HARD_FRAME_POINTER_REGNUM. */
-+#define FRAME_POINTER_REGNUM FAKE_FP_REGNO
-+
-+#define HARD_FRAME_POINTER_REGNUM FP_REGNO
-+#define RETURN_ADDRESS_POINTER_REGNUM RAP_REGNO
-+/* the argumnet pointer needs to always be eliminated
-+ so it is set to a fake hard register. */
-+#define ARG_POINTER_REGNUM FAKE_AP_REGNO
-+
-+/* ----------------------------------------- *
-+ * Eliminating Frame Pointer and Arg Pointer
-+ * ----------------------------------------- */
-+
-+#define FRAME_POINTER_REQUIRED 0
-+
-+#define ELIMINABLE_REGS \
-+{{ ARG_POINTER_REGNUM, STACK_POINTER_REGNUM}, \
-+ { ARG_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}, \
-+ { RETURN_ADDRESS_POINTER_REGNUM, STACK_POINTER_REGNUM}, \
-+ { RETURN_ADDRESS_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}, \
-+ { FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM}, \
-+ { FRAME_POINTER_REGNUM, HARD_FRAME_POINTER_REGNUM}}
-+
-+#define CAN_ELIMINATE(FROM, TO) 1
-+
-+#define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \
-+ (OFFSET) = nios2_initial_elimination_offset ((FROM), (TO))
-+
-+#define MUST_SAVE_REGISTER(regno) \
-+ ((regs_ever_live[regno] && !call_used_regs[regno]) \
-+ || (regno == HARD_FRAME_POINTER_REGNUM && frame_pointer_needed) \
-+ || (regno == RA_REGNO && regs_ever_live[RA_REGNO]))
-+
-+/* Treat LOC as a byte offset from the stack pointer and round it up
-+ to the next fully-aligned offset. */
-+#define STACK_ALIGN(LOC) \
-+ (((LOC) + ((PREFERRED_STACK_BOUNDARY / 8) - 1)) & ~((PREFERRED_STACK_BOUNDARY / 8) - 1))
-+
-+
-+/* ------------------------------ *
-+ * Passing Arguments in Registers
-+ * ------------------------------ */
-+
-+/* see nios2.c */
-+#define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) \
-+ (function_arg (&CUM, MODE, TYPE, NAMED))
-+
-+#define FUNCTION_ARG_PARTIAL_NREGS(CUM, MODE, TYPE, NAMED) \
-+ (function_arg_partial_nregs (&CUM, MODE, TYPE, NAMED))
-+
-+#define FUNCTION_ARG_PASS_BY_REFERENCE(CUM, MODE, TYPE, NAMED) 0
-+
-+#define FUNCTION_ARG_CALLEE_COPIES(CUM, MODE, TYPE, NAMED) 0
-+
-+typedef struct nios2_args
-+{
-+ int regs_used;
-+} CUMULATIVE_ARGS;
-+
-+/* This is to initialize the above unused CUM data type */
-+#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \
-+ (init_cumulative_args (&CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS))
-+
-+#define FUNCTION_ARG_ADVANCE(CUM, MODE, TYPE, NAMED) \
-+ (function_arg_advance (&CUM, MODE, TYPE, NAMED))
-+
-+#define FUNCTION_ARG_REGNO_P(REGNO) \
-+ ((REGNO) >= FIRST_ARG_REGNO && (REGNO) <= LAST_ARG_REGNO)
-+
-+#define SETUP_INCOMING_VARARGS(CUM,MODE,TYPE,PRETEND_SIZE,NO_RTL) \
-+ { \
-+ int pret_size = nios2_setup_incoming_varargs (&(CUM), (MODE), \
-+ (TYPE), (NO_RTL)); \
-+ if (pret_size) \
-+ (PRETEND_SIZE) = pret_size; \
-+ }
-+
-+/* ----------------------------- *
-+ * Generating Code for Profiling
-+ * ----------------------------- */
-+
-+#define PROFILE_BEFORE_PROLOGUE
-+
-+#define FUNCTION_PROFILER(FILE, LABELNO) \
-+ function_profiler ((FILE), (LABELNO))
-+
-+/* --------------------------------------- *
-+ * Passing Function Arguments on the Stack
-+ * --------------------------------------- */
-+
-+#define PROMOTE_PROTOTYPES 1
-+
-+#define PUSH_ARGS 0
-+#define ACCUMULATE_OUTGOING_ARGS 1
-+
-+#define RETURN_POPS_ARGS(FUNDECL, FUNTYPE, STACKSIZE) 0
-+
-+/* --------------------------------------- *
-+ * How Scalar Function Values Are Returned
-+ * --------------------------------------- */
-+
-+#define FUNCTION_VALUE(VALTYPE, FUNC) \
-+ gen_rtx(REG, TYPE_MODE(VALTYPE), FIRST_RETVAL_REGNO)
-+
-+#define LIBCALL_VALUE(MODE) \
-+ gen_rtx(REG, MODE, FIRST_RETVAL_REGNO)
-+
-+#define FUNCTION_VALUE_REGNO_P(REGNO) ((REGNO) == FIRST_RETVAL_REGNO)
-+
-+/* ----------------------------- *
-+ * How Large Values Are Returned
-+ * ----------------------------- */
-+
-+
-+#define RETURN_IN_MEMORY(TYPE) \
-+ nios2_return_in_memory (TYPE)
-+
-+
-+#define STRUCT_VALUE 0
-+
-+#define DEFAULT_PCC_STRUCT_RETURN 0
-+
-+/*******************
-+ * Addressing Modes
-+ *******************/
-+
-+
-+#define LEGITIMIZE_ADDRESS(X, OLDX, MODE, WIN)
-+
-+#define CONSTANT_ADDRESS_P(X) (CONSTANT_P (X))
-+
-+#define MAX_REGS_PER_ADDRESS 1
-+
-+/* Go to ADDR if X is a valid address. */
-+#ifndef REG_OK_STRICT
-+#define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \
-+ { \
-+ if (nios2_legitimate_address ((X), (MODE), 0)) \
-+ goto ADDR; \
-+ }
-+#else
-+#define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \
-+ { \
-+ if (nios2_legitimate_address ((X), (MODE), 1)) \
-+ goto ADDR; \
-+ }
-+#endif
-+
-+#ifndef REG_OK_STRICT
-+#define REG_OK_FOR_BASE_P(X) REGNO_OK_FOR_BASE_P2 (REGNO (X), 0)
-+#define REG_OK_FOR_INDEX_P(X) REGNO_OK_FOR_INDEX_P2 (REGNO (X), 0)
-+#else
-+#define REG_OK_FOR_BASE_P(X) REGNO_OK_FOR_BASE_P2 (REGNO (X), 1)
-+#define REG_OK_FOR_INDEX_P(X) REGNO_OK_FOR_INDEX_P2 (REGNO (X), 1)
-+#endif
-+
-+#define LEGITIMATE_CONSTANT_P(X) 1
-+
-+/* Nios II has no mode dependent addresses. */
-+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
-+
-+/* Set if this has a weak declaration */
-+#define SYMBOL_FLAG_WEAK_DECL (1 << SYMBOL_FLAG_MACH_DEP_SHIFT)
-+#define SYMBOL_REF_WEAK_DECL_P(RTX) \
-+ ((SYMBOL_REF_FLAGS (RTX) & SYMBOL_FLAG_WEAK_DECL) != 0)
-+
-+
-+/* true if a symbol is both small and not weak. In this case, gp
-+ relative access can be used */
-+#define SYMBOL_REF_IN_NIOS2_SMALL_DATA_P(RTX) \
-+ (SYMBOL_REF_SMALL_P(RTX) && !SYMBOL_REF_WEAK_DECL_P(RTX))
-+
-+/*****************
-+ * Describing Relative Costs of Operations
-+ *****************/
-+
-+#define SLOW_BYTE_ACCESS 1
-+
-+/* It is as good to call a constant function address as to call an address
-+ kept in a register.
-+ ??? Not true anymore really. Now that call cannot address full range
-+ of memory callr may need to be used */
-+
-+#define NO_FUNCTION_CSE
-+#define NO_RECURSIVE_FUNCTION_CSE
-+
-+
-+
-+/*****************************************
-+ * Defining the Output Assembler Language
-+ *****************************************/
-+
-+/* ------------------------------------------ *
-+ * The Overall Framework of an Assembler File
-+ * ------------------------------------------ */
-+
-+#define ASM_APP_ON "#APP\n"
-+#define ASM_APP_OFF "#NO_APP\n"
-+
-+#define ASM_COMMENT_START "# "
-+
-+/* ------------------------------- *
-+ * Output and Generation of Labels
-+ * ------------------------------- */
-+
-+#define GLOBAL_ASM_OP "\t.global\t"
-+
-+
-+/* -------------- *
-+ * Output of Data
-+ * -------------- */
-+
-+#define DWARF2_UNWIND_INFO 0
-+
-+
-+/* -------------------------------- *
-+ * Assembler Commands for Alignment
-+ * -------------------------------- */
-+
-+#define ASM_OUTPUT_ALIGN(FILE, LOG) \
-+ do { \
-+ fprintf ((FILE), "%s%d\n", ALIGN_ASM_OP, (LOG)); \
-+ } while (0)
-+
-+
-+/* -------------------------------- *
-+ * Output of Assembler Instructions
-+ * -------------------------------- */
-+
-+#define REGISTER_NAMES \
-+{ \
-+ "zero", \
-+ "at", \
-+ "r2", \
-+ "r3", \
-+ "r4", \
-+ "r5", \
-+ "r6", \
-+ "r7", \
-+ "r8", \
-+ "r9", \
-+ "r10", \
-+ "r11", \
-+ "r12", \
-+ "r13", \
-+ "r14", \
-+ "r15", \
-+ "r16", \
-+ "r17", \
-+ "r18", \
-+ "r19", \
-+ "r20", \
-+ "r21", \
-+ "r22", \
-+ "r23", \
-+ "r24", \
-+ "r25", \
-+ "gp", \
-+ "sp", \
-+ "fp", \
-+ "ta", \
-+ "ba", \
-+ "ra", \
-+ "status", \
-+ "estatus", \
-+ "bstatus", \
-+ "ipri", \
-+ "ecause", \
-+ "pc", \
-+ "rap", \
-+ "fake_fp", \
-+ "fake_ap", \
-+}
-+
-+#define ASM_OUTPUT_OPCODE(STREAM, PTR)\
-+ (PTR) = asm_output_opcode (STREAM, PTR)
-+
-+#define PRINT_OPERAND(STREAM, X, CODE) \
-+ nios2_print_operand (STREAM, X, CODE)
-+
-+#define PRINT_OPERAND_ADDRESS(STREAM, X) \
-+ nios2_print_operand_address (STREAM, X)
-+
-+#define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE) \
-+do { fputs (integer_asm_op (POINTER_SIZE / BITS_PER_UNIT, TRUE), FILE); \
-+ fprintf (FILE, ".L%u\n", (unsigned) (VALUE)); \
-+ } while (0)
-+
-+
-+/* ------------ *
-+ * Label Output
-+ * ------------ */
-+
-+
-+/* ---------------------------------------------------- *
-+ * Dividing the Output into Sections (Texts, Data, ...)
-+ * ---------------------------------------------------- */
-+
-+/* Output before read-only data. */
-+#define TEXT_SECTION_ASM_OP ("\t.section\t.text")
-+
-+/* Output before writable data. */
-+#define DATA_SECTION_ASM_OP ("\t.section\t.data")
-+
-+
-+/* Default the definition of "small data" to 8 bytes. */
-+/* ??? How come I can't use HOST_WIDE_INT here? */
-+extern unsigned long nios2_section_threshold;
-+#define NIOS2_DEFAULT_GVALUE 8
-+
-+
-+
-+/* This says how to output assembler code to declare an
-+ uninitialized external linkage data object. Under SVR4,
-+ the linker seems to want the alignment of data objects
-+ to depend on their types. We do exactly that here. */
-+
-+#undef COMMON_ASM_OP
-+#define COMMON_ASM_OP "\t.comm\t"
-+
-+#undef ASM_OUTPUT_ALIGNED_COMMON
-+#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \
-+do \
-+{ \
-+ if ((SIZE) <= nios2_section_threshold) \
-+ { \
-+ named_section (0, ".sbss", 0); \
-+ (*targetm.asm_out.globalize_label) (FILE, NAME); \
-+ ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
-+ if (!flag_inhibit_size_directive) \
-+ ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
-+ ASM_OUTPUT_ALIGN ((FILE), exact_log2((ALIGN) / BITS_PER_UNIT)); \
-+ ASM_OUTPUT_LABEL(FILE, NAME); \
-+ ASM_OUTPUT_SKIP((FILE), (SIZE) ? (SIZE) : 1); \
-+ } \
-+ else \
-+ { \
-+ fprintf ((FILE), "%s", COMMON_ASM_OP); \
-+ assemble_name ((FILE), (NAME)); \
-+ fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT); \
-+ } \
-+} \
-+while (0)
-+
-+
-+/* This says how to output assembler code to declare an
-+ uninitialized internal linkage data object. Under SVR4,
-+ the linker seems to want the alignment of data objects
-+ to depend on their types. We do exactly that here. */
-+
-+#undef ASM_OUTPUT_ALIGNED_LOCAL
-+#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
-+do { \
-+ if ((SIZE) <= nios2_section_threshold) \
-+ named_section (0, ".sbss", 0); \
-+ else \
-+ named_section (0, ".bss", 0); \
-+ ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
-+ if (!flag_inhibit_size_directive) \
-+ ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
-+ ASM_OUTPUT_ALIGN ((FILE), exact_log2((ALIGN) / BITS_PER_UNIT)); \
-+ ASM_OUTPUT_LABEL(FILE, NAME); \
-+ ASM_OUTPUT_SKIP((FILE), (SIZE) ? (SIZE) : 1); \
-+} while (0)
-+
-+
-+
-+/***************************
-+ * Miscellaneous Parameters
-+ ***************************/
-+
-+#define MOVE_MAX 4
-+
-+#define Pmode SImode
-+#define FUNCTION_MODE QImode
-+
-+#define CASE_VECTOR_MODE Pmode
-+
-+#define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) 1
-+
-+#define LOAD_EXTEND_OP(MODE) (ZERO_EXTEND)
-+
-+#define WORD_REGISTER_OPERATIONS
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2.md gcc-3.4.6/gcc/config/nios2/nios2.md
---- gcc-3.4.6.orig/gcc/config/nios2/nios2.md 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2.md 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,2078 @@
-+;; Machine Description for Altera NIOS 2G NIOS2 version.
-+;; Copyright (C) 2003 Altera
-+;; Contributed by Jonah Graham (jgraham@altera.com).
-+;;
-+;; This file is part of GNU CC.
-+;;
-+;; GNU CC 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.
-+;;
-+;; GNU CC 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 CC; see the file COPYING. If not, write to
-+;; the Free Software Foundation, 59 Temple Place - Suite 330,
-+;; Boston, MA 02111-1307, USA. */
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* constants
-+;*
-+;*****************************************************************************
-+(define_constants [
-+ (GP_REGNO 26)
-+ (SP_REGNO 27)
-+ (FP_REGNO 28)
-+ (RA_REGNO 31)
-+ (RAP_REGNO 38)
-+ (FIRST_RETVAL_REGNO 2)
-+ (LAST_RETVAL_REGNO 3)
-+ (FIRST_ARG_REGNO 4)
-+ (LAST_ARG_REGNO 7)
-+ (SC_REGNO 23)
-+ (PC_REGNO 37)
-+ (FAKE_FP_REGNO 39)
-+ (FAKE_AP_REGNO 40)
-+
-+
-+ (UNSPEC_BLOCKAGE 0)
-+ (UNSPEC_LDBIO 1)
-+ (UNSPEC_LDBUIO 2)
-+ (UNSPEC_LDHIO 3)
-+ (UNSPEC_LDHUIO 4)
-+ (UNSPEC_LDWIO 5)
-+ (UNSPEC_STBIO 6)
-+ (UNSPEC_STHIO 7)
-+ (UNSPEC_STWIO 8)
-+ (UNSPEC_SYNC 9)
-+ (UNSPEC_WRCTL 10)
-+ (UNSPEC_RDCTL 11)
-+
-+])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* instruction scheduler
-+;*
-+;*****************************************************************************
-+
-+; No schedule info is currently available, using an assumption that no
-+; instruction can use the results of the previous instruction without
-+; incuring a stall.
-+
-+; length of an instruction (in bytes)
-+(define_attr "length" "" (const_int 4))
-+(define_attr "type" "unknown,complex,control,alu,cond_alu,st,ld,shift,mul,div,custom" (const_string "complex"))
-+
-+(define_asm_attributes
-+ [(set_attr "length" "4")
-+ (set_attr "type" "complex")])
-+
-+(define_automaton "nios2")
-+(automata_option "v")
-+;(automata_option "no-minimization")
-+(automata_option "ndfa")
-+
-+; The nios2 pipeline is fairly straightforward for the fast model.
-+; Every alu operation is pipelined so that an instruction can
-+; be issued every cycle. However, there are still potential
-+; stalls which this description tries to deal with.
-+
-+(define_cpu_unit "cpu" "nios2")
-+
-+(define_insn_reservation "complex" 1
-+ (eq_attr "type" "complex")
-+ "cpu")
-+
-+(define_insn_reservation "control" 1
-+ (eq_attr "type" "control")
-+ "cpu")
-+
-+(define_insn_reservation "alu" 1
-+ (eq_attr "type" "alu")
-+ "cpu")
-+
-+(define_insn_reservation "cond_alu" 1
-+ (eq_attr "type" "cond_alu")
-+ "cpu")
-+
-+(define_insn_reservation "st" 1
-+ (eq_attr "type" "st")
-+ "cpu")
-+
-+(define_insn_reservation "custom" 1
-+ (eq_attr "type" "custom")
-+ "cpu")
-+
-+; shifts, muls and lds have three cycle latency
-+(define_insn_reservation "ld" 3
-+ (eq_attr "type" "ld")
-+ "cpu")
-+
-+(define_insn_reservation "shift" 3
-+ (eq_attr "type" "shift")
-+ "cpu")
-+
-+(define_insn_reservation "mul" 3
-+ (eq_attr "type" "mul")
-+ "cpu")
-+
-+(define_insn_reservation "div" 1
-+ (eq_attr "type" "div")
-+ "cpu")
-+
-+
-+;*****************************************************************************
-+;*
-+;* MOV Instructions
-+;*
-+;*****************************************************************************
-+
-+(define_expand "movqi"
-+ [(set (match_operand:QI 0 "nonimmediate_operand" "")
-+ (match_operand:QI 1 "general_operand" ""))]
-+ ""
-+{
-+ if (nios2_emit_move_sequence (operands, QImode))
-+ DONE;
-+})
-+
-+(define_insn "movqi_internal"
-+ [(set (match_operand:QI 0 "nonimmediate_operand" "=m, r,r, r")
-+ (match_operand:QI 1 "general_operand" "rM,m,rM,I"))]
-+ "(register_operand (operands[0], QImode)
-+ || register_operand (operands[1], QImode)
-+ || (GET_CODE (operands[1]) == CONST_INT && INTVAL (operands[1]) == 0))"
-+ "@
-+ stb%o0\\t%z1, %0
-+ ldbu%o1\\t%0, %1
-+ mov\\t%0, %z1
-+ movi\\t%0, %1"
-+ [(set_attr "type" "st,ld,alu,alu")])
-+
-+(define_insn "ldbio"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_LDBIO))
-+ (use (match_operand:SI 1 "memory_operand" "m"))]
-+ ""
-+ "ldbio\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_insn "ldbuio"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_LDBUIO))
-+ (use (match_operand:SI 1 "memory_operand" "m"))]
-+ ""
-+ "ldbuio\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_insn "stbio"
-+ [(set (match_operand:SI 0 "memory_operand" "=m")
-+ (match_operand:SI 1 "register_operand" "r"))
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_STBIO)]
-+ ""
-+ "stbio\\t%z1, %0"
-+ [(set_attr "type" "st")])
-+
-+
-+(define_expand "movhi"
-+ [(set (match_operand:HI 0 "nonimmediate_operand" "")
-+ (match_operand:HI 1 "general_operand" ""))]
-+ ""
-+{
-+ if (nios2_emit_move_sequence (operands, HImode))
-+ DONE;
-+})
-+
-+(define_insn "movhi_internal"
-+ [(set (match_operand:HI 0 "nonimmediate_operand" "=m, r,r, r,r")
-+ (match_operand:HI 1 "general_operand" "rM,m,rM,I,J"))]
-+ "(register_operand (operands[0], HImode)
-+ || register_operand (operands[1], HImode)
-+ || (GET_CODE (operands[1]) == CONST_INT && INTVAL (operands[1]) == 0))"
-+ "@
-+ sth%o0\\t%z1, %0
-+ ldhu%o1\\t%0, %1
-+ mov\\t%0, %z1
-+ movi\\t%0, %1
-+ movui\\t%0, %1"
-+ [(set_attr "type" "st,ld,alu,alu,alu")])
-+
-+(define_insn "ldhio"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_LDHIO))
-+ (use (match_operand:SI 1 "memory_operand" "m"))]
-+ ""
-+ "ldhio\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_insn "ldhuio"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_LDHUIO))
-+ (use (match_operand:SI 1 "memory_operand" "m"))]
-+ ""
-+ "ldhuio\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_insn "sthio"
-+ [(set (match_operand:SI 0 "memory_operand" "=m")
-+ (match_operand:SI 1 "register_operand" "r"))
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_STHIO)]
-+ ""
-+ "sthio\\t%z1, %0"
-+ [(set_attr "type" "st")])
-+
-+(define_expand "movsi"
-+ [(set (match_operand:SI 0 "nonimmediate_operand" "")
-+ (match_operand:SI 1 "general_operand" ""))]
-+ ""
-+{
-+ if (nios2_emit_move_sequence (operands, SImode))
-+ DONE;
-+})
-+
-+(define_insn "movsi_internal"
-+ [(set (match_operand:SI 0 "nonimmediate_operand" "=m, r,r, r,r,r,r")
-+ (match_operand:SI 1 "general_operand" "rM,m,rM,I,J,S,i"))]
-+ "(register_operand (operands[0], SImode)
-+ || register_operand (operands[1], SImode)
-+ || (GET_CODE (operands[1]) == CONST_INT && INTVAL (operands[1]) == 0))"
-+ "@
-+ stw%o0\\t%z1, %0
-+ ldw%o1\\t%0, %1
-+ mov\\t%0, %z1
-+ movi\\t%0, %1
-+ movui\\t%0, %1
-+ addi\\t%0, gp, %%gprel(%1)
-+ movhi\\t%0, %H1\;addi\\t%0, %0, %L1"
-+ [(set_attr "type" "st,ld,alu,alu,alu,alu,alu")])
-+
-+(define_insn "ldwio"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_LDWIO))
-+ (use (match_operand:SI 1 "memory_operand" "m"))]
-+ ""
-+ "ldwio\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_insn "stwio"
-+ [(set (match_operand:SI 0 "memory_operand" "=m")
-+ (match_operand:SI 1 "register_operand" "r"))
-+ (unspec_volatile:SI [(const_int 0)] UNSPEC_STWIO)]
-+ ""
-+ "stwio\\t%z1, %0"
-+ [(set_attr "type" "st")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* zero extension
-+;*
-+;*****************************************************************************
-+
-+
-+(define_insn "zero_extendhisi2"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
-+ ""
-+ "@
-+ andi\\t%0, %1, 0xffff
-+ ldhu%o1\\t%0, %1"
-+ [(set_attr "type" "alu,ld")])
-+
-+(define_insn "zero_extendqihi2"
-+ [(set (match_operand:HI 0 "register_operand" "=r,r")
-+ (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "r,m")))]
-+ ""
-+ "@
-+ andi\\t%0, %1, 0xff
-+ ldbu%o1\\t%0, %1"
-+ [(set_attr "type" "alu,ld")])
-+
-+(define_insn "zero_extendqisi2"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,m")))]
-+ ""
-+ "@
-+ andi\\t%0, %1, 0xff
-+ ldbu%o1\\t%0, %1"
-+ [(set_attr "type" "alu,ld")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* sign extension
-+;*
-+;*****************************************************************************
-+
-+(define_expand "extendhisi2"
-+ [(set (match_operand:SI 0 "register_operand" "")
-+ (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "")))]
-+ ""
-+{
-+ if (optimize && GET_CODE (operands[1]) == MEM)
-+ operands[1] = force_not_mem (operands[1]);
-+
-+ if (GET_CODE (operands[1]) != MEM)
-+ {
-+ rtx op1 = gen_lowpart (SImode, operands[1]);
-+ rtx temp = gen_reg_rtx (SImode);
-+ rtx shift = GEN_INT (16);
-+
-+ emit_insn (gen_ashlsi3 (temp, op1, shift));
-+ emit_insn (gen_ashrsi3 (operands[0], temp, shift));
-+ DONE;
-+ }
-+})
-+
-+(define_insn "extendhisi2_internal"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (sign_extend:SI (match_operand:HI 1 "memory_operand" "m")))]
-+ ""
-+ "ldh%o1\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+(define_expand "extendqihi2"
-+ [(set (match_operand:HI 0 "register_operand" "")
-+ (sign_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))]
-+ ""
-+{
-+ if (optimize && GET_CODE (operands[1]) == MEM)
-+ operands[1] = force_not_mem (operands[1]);
-+
-+ if (GET_CODE (operands[1]) != MEM)
-+ {
-+ rtx op0 = gen_lowpart (SImode, operands[0]);
-+ rtx op1 = gen_lowpart (SImode, operands[1]);
-+ rtx temp = gen_reg_rtx (SImode);
-+ rtx shift = GEN_INT (24);
-+
-+ emit_insn (gen_ashlsi3 (temp, op1, shift));
-+ emit_insn (gen_ashrsi3 (op0, temp, shift));
-+ DONE;
-+ }
-+})
-+
-+(define_insn "extendqihi2_internal"
-+ [(set (match_operand:HI 0 "register_operand" "=r")
-+ (sign_extend:HI (match_operand:QI 1 "memory_operand" "m")))]
-+ ""
-+ "ldb%o1\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+
-+(define_expand "extendqisi2"
-+ [(set (match_operand:SI 0 "register_operand" "")
-+ (sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))]
-+ ""
-+{
-+ if (optimize && GET_CODE (operands[1]) == MEM)
-+ operands[1] = force_not_mem (operands[1]);
-+
-+ if (GET_CODE (operands[1]) != MEM)
-+ {
-+ rtx op1 = gen_lowpart (SImode, operands[1]);
-+ rtx temp = gen_reg_rtx (SImode);
-+ rtx shift = GEN_INT (24);
-+
-+ emit_insn (gen_ashlsi3 (temp, op1, shift));
-+ emit_insn (gen_ashrsi3 (operands[0], temp, shift));
-+ DONE;
-+ }
-+})
-+
-+(define_insn "extendqisi2_insn"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (sign_extend:SI (match_operand:QI 1 "memory_operand" "m")))]
-+ ""
-+ "ldb%o1\\t%0, %1"
-+ [(set_attr "type" "ld")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Arithmetic Operations
-+;*
-+;*****************************************************************************
-+
-+(define_insn "addsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (plus:SI (match_operand:SI 1 "register_operand" "%r,r")
-+ (match_operand:SI 2 "arith_operand" "r,I")))]
-+ ""
-+ "add%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "subsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "register_operand" "r")))]
-+ ""
-+ "sub\\t%0, %z1, %2"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "mulsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (mult:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "arith_operand" "r,I")))]
-+ "TARGET_HAS_MUL"
-+ "mul%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "mul")])
-+
-+(define_expand "divsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (div:SI (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")))]
-+ ""
-+{
-+ if (!TARGET_HAS_DIV)
-+ {
-+ if (!TARGET_FAST_SW_DIV)
-+ FAIL;
-+ else
-+ {
-+ if (nios2_emit_expensive_div (operands, SImode))
-+ DONE;
-+ }
-+ }
-+})
-+
-+(define_insn "divsi3_insn"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (div:SI (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")))]
-+ "TARGET_HAS_DIV"
-+ "div\\t%0, %1, %2"
-+ [(set_attr "type" "div")])
-+
-+(define_insn "udivsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (udiv:SI (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")))]
-+ "TARGET_HAS_DIV"
-+ "divu\\t%0, %1, %2"
-+ [(set_attr "type" "div")])
-+
-+(define_insn "smulsi3_highpart"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (truncate:SI
-+ (lshiftrt:DI
-+ (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-+ (sign_extend:DI (match_operand:SI 2 "register_operand" "r")))
-+ (const_int 32))))]
-+ "TARGET_HAS_MULX"
-+ "mulxss\\t%0, %1, %2"
-+ [(set_attr "type" "mul")])
-+
-+(define_insn "umulsi3_highpart"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (truncate:SI
-+ (lshiftrt:DI
-+ (mult:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "r"))
-+ (zero_extend:DI (match_operand:SI 2 "register_operand" "r")))
-+ (const_int 32))))]
-+ "TARGET_HAS_MULX"
-+ "mulxuu\\t%0, %1, %2"
-+ [(set_attr "type" "mul")])
-+
-+
-+(define_expand "mulsidi3"
-+ [(set (subreg:SI (match_operand:DI 0 "register_operand" "") 0)
-+ (mult:SI (match_operand:SI 1 "register_operand" "")
-+ (match_operand:SI 2 "register_operand" "")))
-+ (set (subreg:SI (match_dup 0) 4)
-+ (truncate:SI (lshiftrt:DI (mult:DI (sign_extend:DI (match_dup 1))
-+ (sign_extend:DI (match_dup 2)))
-+ (const_int 32))))]
-+ "TARGET_HAS_MULX"
-+ "")
-+
-+(define_expand "umulsidi3"
-+ [(set (subreg:SI (match_operand:DI 0 "register_operand" "") 0)
-+ (mult:SI (match_operand:SI 1 "register_operand" "")
-+ (match_operand:SI 2 "register_operand" "")))
-+ (set (subreg:SI (match_dup 0) 4)
-+ (truncate:SI (lshiftrt:DI (mult:DI (zero_extend:DI (match_dup 1))
-+ (zero_extend:DI (match_dup 2)))
-+ (const_int 32))))]
-+ "TARGET_HAS_MULX"
-+ "")
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Negate and ones complement
-+;*
-+;*****************************************************************************
-+
-+(define_insn "negsi2"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (neg:SI (match_operand:SI 1 "register_operand" "r")))]
-+ ""
-+{
-+ operands[2] = const0_rtx;
-+ return "sub\\t%0, %z2, %1";
-+}
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "one_cmplsi2"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (not:SI (match_operand:SI 1 "register_operand" "r")))]
-+ ""
-+{
-+ operands[2] = const0_rtx;
-+ return "nor\\t%0, %z2, %1";
-+}
-+ [(set_attr "type" "alu")])
-+
-+
-+
-+; Logical Operantions
-+
-+(define_insn "andsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r, r,r")
-+ (and:SI (match_operand:SI 1 "register_operand" "%r, r,r")
-+ (match_operand:SI 2 "logical_operand" "rM,J,K")))]
-+ ""
-+ "@
-+ and\\t%0, %1, %z2
-+ and%i2\\t%0, %1, %2
-+ andh%i2\\t%0, %1, %U2"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "iorsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r, r,r")
-+ (ior:SI (match_operand:SI 1 "register_operand" "%r, r,r")
-+ (match_operand:SI 2 "logical_operand" "rM,J,K")))]
-+ ""
-+ "@
-+ or\\t%0, %1, %z2
-+ or%i2\\t%0, %1, %2
-+ orh%i2\\t%0, %1, %U2"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "*norsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (and:SI (not:SI (match_operand:SI 1 "register_operand" "%r"))
-+ (not:SI (match_operand:SI 2 "reg_or_0_operand" "rM"))))]
-+ ""
-+ "nor\\t%0, %1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "xorsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r, r,r")
-+ (xor:SI (match_operand:SI 1 "register_operand" "%r, r,r")
-+ (match_operand:SI 2 "logical_operand" "rM,J,K")))]
-+ ""
-+ "@
-+ xor\\t%0, %1, %z2
-+ xor%i2\\t%0, %1, %2
-+ xorh%i2\\t%0, %1, %U2"
-+ [(set_attr "type" "alu")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Shifts
-+;*
-+;*****************************************************************************
-+
-+(define_insn "ashlsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (ashift:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "shift_operand" "r,L")))]
-+ ""
-+ "sll%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "shift")])
-+
-+(define_insn "ashrsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (ashiftrt:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "shift_operand" "r,L")))]
-+ ""
-+ "sra%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "shift")])
-+
-+(define_insn "lshrsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (lshiftrt:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "shift_operand" "r,L")))]
-+ ""
-+ "srl%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "shift")])
-+
-+(define_insn "rotlsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (rotate:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "shift_operand" "r,L")))]
-+ ""
-+ "rol%i2\\t%0, %1, %z2"
-+ [(set_attr "type" "shift")])
-+
-+(define_insn "rotrsi3"
-+ [(set (match_operand:SI 0 "register_operand" "=r,r")
-+ (rotatert:SI (match_operand:SI 1 "register_operand" "r,r")
-+ (match_operand:SI 2 "register_operand" "r,r")))]
-+ ""
-+ "ror\\t%0, %1, %2"
-+ [(set_attr "type" "shift")])
-+
-+(define_insn "*shift_mul_constants"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ashift:SI (mult:SI (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "const_int_operand" "I"))
-+ (match_operand:SI 3 "const_int_operand" "I")))]
-+ "TARGET_HAS_MUL && SMALL_INT (INTVAL (operands[2]) << INTVAL (operands[3]))"
-+{
-+ HOST_WIDE_INT mul = INTVAL (operands[2]) << INTVAL (operands[3]);
-+ rtx ops[3];
-+
-+ ops[0] = operands[0];
-+ ops[1] = operands[1];
-+ ops[2] = GEN_INT (mul);
-+
-+ output_asm_insn ("muli\t%0, %1, %2", ops);
-+ return "";
-+}
-+ [(set_attr "type" "mul")])
-+
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Prologue, Epilogue and Return
-+;*
-+;*****************************************************************************
-+
-+(define_expand "prologue"
-+ [(const_int 1)]
-+ ""
-+{
-+ expand_prologue ();
-+ DONE;
-+})
-+
-+(define_expand "epilogue"
-+ [(return)]
-+ ""
-+{
-+ expand_epilogue (false);
-+ DONE;
-+})
-+
-+(define_expand "sibcall_epilogue"
-+ [(return)]
-+ ""
-+{
-+ expand_epilogue (true);
-+ DONE;
-+})
-+
-+(define_insn "return"
-+ [(return)]
-+ "reload_completed && nios2_can_use_return_insn ()"
-+ "ret\\t"
-+)
-+
-+(define_insn "return_from_epilogue"
-+ [(use (match_operand 0 "pmode_register_operand" ""))
-+ (return)]
-+ "reload_completed"
-+ "ret\\t"
-+)
-+
-+;; Block any insns from being moved before this point, since the
-+;; profiling call to mcount can use various registers that aren't
-+;; saved or used to pass arguments.
-+
-+(define_insn "blockage"
-+ [(unspec_volatile [(const_int 0)] UNSPEC_BLOCKAGE)]
-+ ""
-+ ""
-+ [(set_attr "type" "unknown")
-+ (set_attr "length" "0")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Jumps and Calls
-+;*
-+;*****************************************************************************
-+
-+(define_insn "indirect_jump"
-+ [(set (pc) (match_operand:SI 0 "register_operand" "r"))]
-+ ""
-+ "jmp\\t%0"
-+ [(set_attr "type" "control")])
-+
-+(define_insn "jump"
-+ [(set (pc)
-+ (label_ref (match_operand 0 "" "")))]
-+ ""
-+ "br\\t%0"
-+ [(set_attr "type" "control")])
-+
-+
-+(define_insn "indirect_call"
-+ [(call (mem:QI (match_operand:SI 0 "register_operand" "r"))
-+ (match_operand 1 "" ""))
-+ (clobber (reg:SI RA_REGNO))]
-+ ""
-+ "callr\\t%0"
-+ [(set_attr "type" "control")])
-+
-+(define_insn "indirect_call_value"
-+ [(set (match_operand 0 "" "")
-+ (call (mem:QI (match_operand:SI 1 "register_operand" "r"))
-+ (match_operand 2 "" "")))
-+ (clobber (reg:SI RA_REGNO))]
-+ ""
-+ "callr\\t%1"
-+)
-+
-+(define_expand "call"
-+ [(parallel [(call (match_operand 0 "" "")
-+ (match_operand 1 "" ""))
-+ (clobber (reg:SI RA_REGNO))])]
-+ ""
-+ "")
-+
-+(define_expand "call_value"
-+ [(parallel [(set (match_operand 0 "" "")
-+ (call (match_operand 1 "" "")
-+ (match_operand 2 "" "")))
-+ (clobber (reg:SI RA_REGNO))])]
-+ ""
-+ "")
-+
-+(define_insn "*call"
-+ [(call (mem:QI (match_operand:SI 0 "immediate_operand" "i"))
-+ (match_operand 1 "" ""))
-+ (clobber (match_operand:SI 2 "register_operand" "=r"))]
-+ ""
-+ "call\\t%0"
-+ [(set_attr "type" "control")])
-+
-+(define_insn "*call_value"
-+ [(set (match_operand 0 "" "")
-+ (call (mem:QI (match_operand:SI 1 "immediate_operand" "i"))
-+ (match_operand 2 "" "")))
-+ (clobber (match_operand:SI 3 "register_operand" "=r"))]
-+ ""
-+ "call\\t%1"
-+ [(set_attr "type" "control")])
-+
-+(define_expand "sibcall"
-+ [(parallel [(call (match_operand 0 "" "")
-+ (match_operand 1 "" ""))
-+ (return)
-+ (use (match_operand 2 "" ""))])]
-+ ""
-+ {
-+ XEXP (operands[0], 0) = copy_to_mode_reg (SImode, XEXP (operands[0], 0));
-+
-+ if (operands[2] == NULL_RTX)
-+ operands[2] = const0_rtx;
-+ }
-+)
-+
-+(define_expand "sibcall_value"
-+ [(parallel [(set (match_operand 0 "" "")
-+ (call (match_operand 1 "" "")
-+ (match_operand 2 "" "")))
-+ (return)
-+ (use (match_operand 3 "" ""))])]
-+ ""
-+ {
-+ XEXP (operands[1], 0) = copy_to_mode_reg (SImode, XEXP (operands[1], 0));
-+
-+ if (operands[3] == NULL_RTX)
-+ operands[3] = const0_rtx;
-+ }
-+)
-+
-+(define_insn "sibcall_insn"
-+ [(call (mem:QI (match_operand:SI 0 "register_operand" "r"))
-+ (match_operand 1 "" ""))
-+ (return)
-+ (use (match_operand 2 "" ""))]
-+ ""
-+ "jmp\\t%0"
-+)
-+
-+(define_insn "sibcall_value_insn"
-+ [(set (match_operand 0 "register_operand" "")
-+ (call (mem:QI (match_operand:SI 1 "register_operand" "r"))
-+ (match_operand 2 "" "")))
-+ (return)
-+ (use (match_operand 3 "" ""))]
-+ ""
-+ "jmp\\t%1"
-+)
-+
-+
-+
-+
-+(define_expand "tablejump"
-+ [(parallel [(set (pc) (match_operand 0 "register_operand" "r"))
-+ (use (label_ref (match_operand 1 "" "")))])]
-+ ""
-+ ""
-+)
-+
-+(define_insn "*tablejump"
-+ [(set (pc)
-+ (match_operand:SI 0 "register_operand" "r"))
-+ (use (label_ref (match_operand 1 "" "")))]
-+ ""
-+ "jmp\\t%0"
-+ [(set_attr "type" "control")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Comparisons
-+;*
-+;*****************************************************************************
-+;; Flow here is rather complex (based on MIPS):
-+;;
-+;; 1) The cmp{si,di,sf,df} routine is called. It deposits the
-+;; arguments into the branch_cmp array, and the type into
-+;; branch_type. No RTL is generated.
-+;;
-+;; 2) The appropriate branch define_expand is called, which then
-+;; creates the appropriate RTL for the comparison and branch.
-+;; Different CC modes are used, based on what type of branch is
-+;; done, so that we can constrain things appropriately. There
-+;; are assumptions in the rest of GCC that break if we fold the
-+;; operands into the branchs for integer operations, and use cc0
-+;; for floating point, so we use the fp status register instead.
-+;; If needed, an appropriate temporary is created to hold the
-+;; of the integer compare.
-+
-+(define_expand "cmpsi"
-+ [(set (cc0)
-+ (compare:CC (match_operand:SI 0 "register_operand" "")
-+ (match_operand:SI 1 "arith_operand" "")))]
-+ ""
-+{
-+ branch_cmp[0] = operands[0];
-+ branch_cmp[1] = operands[1];
-+ branch_type = CMP_SI;
-+ DONE;
-+})
-+
-+(define_expand "tstsi"
-+ [(set (cc0)
-+ (match_operand:SI 0 "register_operand" ""))]
-+ ""
-+{
-+ branch_cmp[0] = operands[0];
-+ branch_cmp[1] = const0_rtx;
-+ branch_type = CMP_SI;
-+ DONE;
-+})
-+
-+
-+;*****************************************************************************
-+;*
-+;* setting a register from a comparison
-+;*
-+;*****************************************************************************
-+
-+(define_expand "seq"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (eq:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (EQ, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*seq"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (eq:SI (match_operand:SI 1 "reg_or_0_operand" "%rM")
-+ (match_operand:SI 2 "arith_operand" "rI")))]
-+ ""
-+ "cmpeq%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sne"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ne:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (NE, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sne"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ne:SI (match_operand:SI 1 "reg_or_0_operand" "%rM")
-+ (match_operand:SI 2 "arith_operand" "rI")))]
-+ ""
-+ "cmpne%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sgt"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gt:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (GT, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sgt"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gt:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "reg_or_0_operand" "rM")))]
-+ ""
-+ "cmplt\\t%0, %z2, %z1"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sge"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ge:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (GE, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sge"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ge:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "arith_operand" "rI")))]
-+ ""
-+ "cmpge%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+(define_expand "sle"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (le:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (LE, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sle"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (le:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "reg_or_0_operand" "rM")))]
-+ ""
-+ "cmpge\\t%0, %z2, %z1"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "slt"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (lt:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (LT, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*slt"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (lt:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "arith_operand" "rI")))]
-+ ""
-+ "cmplt%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sgtu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gtu:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (GTU, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sgtu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gtu:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "reg_or_0_operand" "rM")))]
-+ ""
-+ "cmpltu\\t%0, %z2, %z1"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sgeu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (geu:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (GEU, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sgeu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (geu:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "uns_arith_operand" "rJ")))]
-+ ""
-+ "cmpgeu%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+(define_expand "sleu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (leu:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (LEU, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sleu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (leu:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "reg_or_0_operand" "rM")))]
-+ ""
-+ "cmpgeu\\t%0, %z2, %z1"
-+ [(set_attr "type" "alu")])
-+
-+
-+(define_expand "sltu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ltu:SI (match_dup 1)
-+ (match_dup 2)))]
-+ ""
-+{
-+ if (branch_type != CMP_SI)
-+ FAIL;
-+
-+ /* set up operands from compare. */
-+ operands[1] = branch_cmp[0];
-+ operands[2] = branch_cmp[1];
-+
-+ gen_int_relational (LTU, operands[0], operands[1], operands[2], NULL_RTX);
-+ DONE;
-+})
-+
-+
-+(define_insn "*sltu"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ltu:SI (match_operand:SI 1 "reg_or_0_operand" "rM")
-+ (match_operand:SI 2 "uns_arith_operand" "rJ")))]
-+ ""
-+ "cmpltu%i2\\t%0, %z1, %z2"
-+ [(set_attr "type" "alu")])
-+
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* branches
-+;*
-+;*****************************************************************************
-+
-+(define_insn "*cbranch"
-+ [(set (pc)
-+ (if_then_else
-+ (match_operator:SI 0 "comparison_operator"
-+ [(match_operand:SI 2 "reg_or_0_operand" "rM")
-+ (match_operand:SI 3 "reg_or_0_operand" "rM")])
-+ (label_ref (match_operand 1 "" ""))
-+ (pc)))]
-+ ""
-+ "b%0\\t%z2, %z3, %l1"
-+ [(set_attr "type" "control")])
-+
-+
-+(define_expand "beq"
-+ [(set (pc)
-+ (if_then_else (eq:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (EQ, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+
-+(define_expand "bne"
-+ [(set (pc)
-+ (if_then_else (ne:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (NE, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+
-+(define_expand "bgt"
-+ [(set (pc)
-+ (if_then_else (gt:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (GT, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "bge"
-+ [(set (pc)
-+ (if_then_else (ge:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (GE, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "ble"
-+ [(set (pc)
-+ (if_then_else (le:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (LE, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "blt"
-+ [(set (pc)
-+ (if_then_else (lt:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (LT, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+
-+(define_expand "bgtu"
-+ [(set (pc)
-+ (if_then_else (gtu:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (GTU, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "bgeu"
-+ [(set (pc)
-+ (if_then_else (geu:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (GEU, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "bleu"
-+ [(set (pc)
-+ (if_then_else (leu:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (LEU, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+(define_expand "bltu"
-+ [(set (pc)
-+ (if_then_else (ltu:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+{
-+ gen_int_relational (LTU, NULL_RTX, branch_cmp[0], branch_cmp[1], operands[0]);
-+ DONE;
-+})
-+
-+
-+;*****************************************************************************
-+;*
-+;* String and Block Operations
-+;*
-+;*****************************************************************************
-+
-+; ??? This is all really a hack to get Dhrystone to work as fast as possible
-+; things to be fixed:
-+; * let the compiler core handle all of this, for that to work the extra
-+; aliasing needs to be addressed.
-+; * we use three temporary registers for loading and storing to ensure no
-+; ld use stalls, this is excessive, because after the first ld/st only
-+; two are needed. Only two would be needed all the way through if
-+; we could schedule with other code. Consider:
-+; 1 ld $1, 0($src)
-+; 2 ld $2, 4($src)
-+; 3 ld $3, 8($src)
-+; 4 st $1, 0($dest)
-+; 5 ld $1, 12($src)
-+; 6 st $2, 4($src)
-+; 7 etc.
-+; The first store has to wait until 4. If it does not there will be one
-+; cycle of stalling. However, if any other instruction could be placed
-+; between 1 and 4, $3 would not be needed.
-+; * In small we probably don't want to ever do this ourself because there
-+; is no ld use stall.
-+
-+(define_expand "movstrsi"
-+ [(parallel [(set (match_operand:BLK 0 "general_operand" "")
-+ (match_operand:BLK 1 "general_operand" ""))
-+ (use (match_operand:SI 2 "const_int_operand" ""))
-+ (use (match_operand:SI 3 "const_int_operand" ""))
-+ (clobber (match_scratch:SI 4 "=&r"))
-+ (clobber (match_scratch:SI 5 "=&r"))
-+ (clobber (match_scratch:SI 6 "=&r"))])]
-+ "TARGET_INLINE_MEMCPY"
-+{
-+ rtx ld_addr_reg, st_addr_reg;
-+
-+ /* If the predicate for op2 fails in expr.c:emit_block_move_via_movstr
-+ it trys to copy to a register, but does not re-try the predicate.
-+ ??? Intead of fixing expr.c, I fix it here. */
-+ if (!const_int_operand (operands[2], SImode))
-+ FAIL;
-+
-+ /* ??? there are some magic numbers which need to be sorted out here.
-+ the basis for them is not increasing code size hugely or going
-+ out of range of offset addressing */
-+ if (INTVAL (operands[3]) < 4)
-+ FAIL;
-+ if (!optimize
-+ || (optimize_size && INTVAL (operands[2]) > 12)
-+ || (optimize < 3 && INTVAL (operands[2]) > 100)
-+ || INTVAL (operands[2]) > 200)
-+ FAIL;
-+
-+ st_addr_reg
-+ = replace_equiv_address (operands[0],
-+ copy_to_mode_reg (Pmode, XEXP (operands[0], 0)));
-+ ld_addr_reg
-+ = replace_equiv_address (operands[1],
-+ copy_to_mode_reg (Pmode, XEXP (operands[1], 0)));
-+ emit_insn (gen_movstrsi_internal (st_addr_reg, ld_addr_reg,
-+ operands[2], operands[3]));
-+
-+ DONE;
-+})
-+
-+
-+(define_insn "movstrsi_internal"
-+ [(set (match_operand:BLK 0 "memory_operand" "=o")
-+ (match_operand:BLK 1 "memory_operand" "o"))
-+ (use (match_operand:SI 2 "const_int_operand" "i"))
-+ (use (match_operand:SI 3 "const_int_operand" "i"))
-+ (clobber (match_scratch:SI 4 "=&r"))
-+ (clobber (match_scratch:SI 5 "=&r"))
-+ (clobber (match_scratch:SI 6 "=&r"))]
-+ "TARGET_INLINE_MEMCPY"
-+{
-+ int ld_offset = INTVAL (operands[2]);
-+ int ld_len = INTVAL (operands[2]);
-+ int ld_reg = 0;
-+ rtx ld_addr_reg = XEXP (operands[1], 0);
-+ int st_offset = INTVAL (operands[2]);
-+ int st_len = INTVAL (operands[2]);
-+ int st_reg = 0;
-+ rtx st_addr_reg = XEXP (operands[0], 0);
-+ int delay_count = 0;
-+
-+ /* ops[0] is the address used by the insn
-+ ops[1] is the register being loaded or stored */
-+ rtx ops[2];
-+
-+ if (INTVAL (operands[3]) < 4)
-+ abort ();
-+
-+ while (ld_offset >= 4)
-+ {
-+ /* if the load use delay has been met, I can start
-+ storing */
-+ if (delay_count >= 3)
-+ {
-+ ops[0] = gen_rtx (MEM, SImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("stw\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 4;
-+ }
-+
-+ ops[0] = gen_rtx (MEM, SImode,
-+ plus_constant (ld_addr_reg, ld_len - ld_offset));
-+ ops[1] = operands[ld_reg + 4];
-+ output_asm_insn ("ldw\t%1, %0", ops);
-+
-+ ld_reg = (ld_reg + 1) % 3;
-+ ld_offset -= 4;
-+ delay_count++;
-+ }
-+
-+ if (ld_offset >= 2)
-+ {
-+ /* if the load use delay has been met, I can start
-+ storing */
-+ if (delay_count >= 3)
-+ {
-+ ops[0] = gen_rtx (MEM, SImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("stw\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 4;
-+ }
-+
-+ ops[0] = gen_rtx (MEM, HImode,
-+ plus_constant (ld_addr_reg, ld_len - ld_offset));
-+ ops[1] = operands[ld_reg + 4];
-+ output_asm_insn ("ldh\t%1, %0", ops);
-+
-+ ld_reg = (ld_reg + 1) % 3;
-+ ld_offset -= 2;
-+ delay_count++;
-+ }
-+
-+ if (ld_offset >= 1)
-+ {
-+ /* if the load use delay has been met, I can start
-+ storing */
-+ if (delay_count >= 3)
-+ {
-+ ops[0] = gen_rtx (MEM, SImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("stw\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 4;
-+ }
-+
-+ ops[0] = gen_rtx (MEM, QImode,
-+ plus_constant (ld_addr_reg, ld_len - ld_offset));
-+ ops[1] = operands[ld_reg + 4];
-+ output_asm_insn ("ldb\t%1, %0", ops);
-+
-+ ld_reg = (ld_reg + 1) % 3;
-+ ld_offset -= 1;
-+ delay_count++;
-+ }
-+
-+ while (st_offset >= 4)
-+ {
-+ ops[0] = gen_rtx (MEM, SImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("stw\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 4;
-+ }
-+
-+ while (st_offset >= 2)
-+ {
-+ ops[0] = gen_rtx (MEM, HImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("sth\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 2;
-+ }
-+
-+ while (st_offset >= 1)
-+ {
-+ ops[0] = gen_rtx (MEM, QImode,
-+ plus_constant (st_addr_reg, st_len - st_offset));
-+ ops[1] = operands[st_reg + 4];
-+ output_asm_insn ("stb\t%1, %0", ops);
-+
-+ st_reg = (st_reg + 1) % 3;
-+ st_offset -= 1;
-+ }
-+
-+ return "";
-+}
-+; ??? lengths are not being used yet, but I will probably forget
-+; to update this once I am using lengths, so set it to something
-+; definetely big enough to cover it. 400 allows for 200 bytes
-+; of motion.
-+ [(set_attr "length" "400")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Custom instructions
-+;*
-+;*****************************************************************************
-+
-+(define_constants [
-+ (CUSTOM_N 100)
-+ (CUSTOM_NI 101)
-+ (CUSTOM_NF 102)
-+ (CUSTOM_NP 103)
-+ (CUSTOM_NII 104)
-+ (CUSTOM_NIF 105)
-+ (CUSTOM_NIP 106)
-+ (CUSTOM_NFI 107)
-+ (CUSTOM_NFF 108)
-+ (CUSTOM_NFP 109)
-+ (CUSTOM_NPI 110)
-+ (CUSTOM_NPF 111)
-+ (CUSTOM_NPP 112)
-+ (CUSTOM_IN 113)
-+ (CUSTOM_INI 114)
-+ (CUSTOM_INF 115)
-+ (CUSTOM_INP 116)
-+ (CUSTOM_INII 117)
-+ (CUSTOM_INIF 118)
-+ (CUSTOM_INIP 119)
-+ (CUSTOM_INFI 120)
-+ (CUSTOM_INFF 121)
-+ (CUSTOM_INFP 122)
-+ (CUSTOM_INPI 123)
-+ (CUSTOM_INPF 124)
-+ (CUSTOM_INPP 125)
-+ (CUSTOM_FN 126)
-+ (CUSTOM_FNI 127)
-+ (CUSTOM_FNF 128)
-+ (CUSTOM_FNP 129)
-+ (CUSTOM_FNII 130)
-+ (CUSTOM_FNIF 131)
-+ (CUSTOM_FNIP 132)
-+ (CUSTOM_FNFI 133)
-+ (CUSTOM_FNFF 134)
-+ (CUSTOM_FNFP 135)
-+ (CUSTOM_FNPI 136)
-+ (CUSTOM_FNPF 137)
-+ (CUSTOM_FNPP 138)
-+ (CUSTOM_PN 139)
-+ (CUSTOM_PNI 140)
-+ (CUSTOM_PNF 141)
-+ (CUSTOM_PNP 142)
-+ (CUSTOM_PNII 143)
-+ (CUSTOM_PNIF 144)
-+ (CUSTOM_PNIP 145)
-+ (CUSTOM_PNFI 146)
-+ (CUSTOM_PNFF 147)
-+ (CUSTOM_PNFP 148)
-+ (CUSTOM_PNPI 149)
-+ (CUSTOM_PNPF 150)
-+ (CUSTOM_PNPP 151)
-+])
-+
-+
-+(define_insn "custom_n"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")] CUSTOM_N)]
-+ ""
-+ "custom\\t%0, zero, zero, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_ni"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")] CUSTOM_NI)]
-+ ""
-+ "custom\\t%0, zero, %1, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nf"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SF 1 "register_operand" "r")] CUSTOM_NF)]
-+ ""
-+ "custom\\t%0, zero, %1, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_np"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")] CUSTOM_NP)]
-+ ""
-+ "custom\\t%0, zero, %1, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nii"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NII)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nif"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_NIF)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nip"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NIP)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nfi"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SF 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NFI)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nff"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SF 1 "register_operand" "r")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_NFF)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_nfp"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SF 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NFP)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_npi"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NPI)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_npf"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_NPF)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_npp"
-+ [(unspec_volatile [(match_operand:SI 0 "custom_insn_opcode" "N")
-+ (match_operand:SI 1 "register_operand" "r")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_NPP)]
-+ ""
-+ "custom\\t%0, zero, %1, %2"
-+ [(set_attr "type" "custom")])
-+
-+
-+
-+(define_insn "custom_in"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")] CUSTOM_IN))]
-+ ""
-+ "custom\\t%1, %0, zero, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_ini"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_INI))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inf"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_INF))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_INP))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inii"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INII))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inif"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_INIF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inip"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INIP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_infi"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INFI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inff"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_INFF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_infp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INFP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inpi"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INPI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inpf"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_INPF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_inpp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_INPP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+
-+
-+
-+
-+(define_insn "custom_fn"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")] CUSTOM_FN))]
-+ ""
-+ "custom\\t%1, %0, zero, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fni"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_FNI))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnf"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_FNF))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnp"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_FNP))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnii"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNII))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnif"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_FNIF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnip"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNIP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnfi"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNFI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnff"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_FNFF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnfp"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNFP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnpi"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNPI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnpf"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_FNPF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_fnpp"
-+ [(set (match_operand:SF 0 "register_operand" "=r")
-+ (unspec_volatile:SF [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_FNPP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+
-+
-+(define_insn "custom_pn"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")] CUSTOM_PN))]
-+ ""
-+ "custom\\t%1, %0, zero, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pni"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_PNI))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnf"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")] CUSTOM_PNF))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")] CUSTOM_PNP))]
-+ ""
-+ "custom\\t%1, %0, %2, zero"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnii"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNII))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnif"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_PNIF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnip"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNIP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnfi"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNFI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnff"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_PNFF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnfp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SF 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNFP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnpi"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNPI))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnpf"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SF 3 "register_operand" "r")] CUSTOM_PNPF))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+(define_insn "custom_pnpp"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "custom_insn_opcode" "N")
-+ (match_operand:SI 2 "register_operand" "r")
-+ (match_operand:SI 3 "register_operand" "r")] CUSTOM_PNPP))]
-+ ""
-+ "custom\\t%1, %0, %2, %3"
-+ [(set_attr "type" "custom")])
-+
-+
-+
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Misc
-+;*
-+;*****************************************************************************
-+
-+(define_insn "nop"
-+ [(const_int 0)]
-+ ""
-+ "nop\\t"
-+ [(set_attr "type" "alu")])
-+
-+(define_insn "sync"
-+ [(unspec_volatile [(const_int 0)] UNSPEC_SYNC)]
-+ ""
-+ "sync\\t"
-+ [(set_attr "type" "control")])
-+
-+
-+(define_insn "rdctl"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec_volatile:SI [(match_operand:SI 1 "rdwrctl_operand" "O")] UNSPEC_RDCTL))]
-+ ""
-+ "rdctl\\t%0, ctl%1"
-+ [(set_attr "type" "control")])
-+
-+(define_insn "wrctl"
-+ [(unspec_volatile:SI [(match_operand:SI 0 "rdwrctl_operand" "O")
-+ (match_operand:SI 1 "register_operand" "r")] UNSPEC_WRCTL)]
-+ ""
-+ "wrctl\\tctl%0, %1"
-+ [(set_attr "type" "control")])
-+
-+
-+
-+;*****************************************************************************
-+;*
-+;* Peepholes
-+;*
-+;*****************************************************************************
-+
-+
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/nios2-protos.h gcc-3.4.6/gcc/config/nios2/nios2-protos.h
---- gcc-3.4.6.orig/gcc/config/nios2/nios2-protos.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/nios2-protos.h 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,70 @@
-+/* Subroutines for assembler code output for Altera NIOS 2G NIOS2 version.
-+ Copyright (C) 2003 Altera
-+ Contributed by Jonah Graham (jgraham@altera.com).
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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.
-+
-+GNU CC 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 CC; see the file COPYING. If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA. */
-+
-+extern void dump_frame_size (FILE *);
-+extern HOST_WIDE_INT compute_frame_size (void);
-+extern int nios2_initial_elimination_offset (int, int);
-+extern void override_options (void);
-+extern void optimization_options (int, int);
-+extern int nios2_can_use_return_insn (void);
-+extern void expand_prologue (void);
-+extern void expand_epilogue (bool);
-+extern void function_profiler (FILE *, int);
-+
-+
-+#ifdef RTX_CODE
-+extern int nios2_legitimate_address (rtx, enum machine_mode, int);
-+extern void nios2_print_operand (FILE *, rtx, int);
-+extern void nios2_print_operand_address (FILE *, rtx);
-+
-+extern int nios2_emit_move_sequence (rtx *, enum machine_mode);
-+extern int nios2_emit_expensive_div (rtx *, enum machine_mode);
-+
-+extern void gen_int_relational (enum rtx_code, rtx, rtx, rtx, rtx);
-+extern void gen_conditional_move (rtx *, enum machine_mode);
-+extern const char *asm_output_opcode (FILE *, const char *);
-+
-+/* predicates */
-+extern int arith_operand (rtx, enum machine_mode);
-+extern int uns_arith_operand (rtx, enum machine_mode);
-+extern int logical_operand (rtx, enum machine_mode);
-+extern int shift_operand (rtx, enum machine_mode);
-+extern int reg_or_0_operand (rtx, enum machine_mode);
-+extern int equality_op (rtx, enum machine_mode);
-+extern int custom_insn_opcode (rtx, enum machine_mode);
-+extern int rdwrctl_operand (rtx, enum machine_mode);
-+
-+# ifdef HAVE_MACHINE_MODES
-+# if defined TREE_CODE
-+extern void function_arg_advance (CUMULATIVE_ARGS *, enum machine_mode, tree, int);
-+extern rtx function_arg (const CUMULATIVE_ARGS *, enum machine_mode, tree, int);
-+extern int function_arg_partial_nregs (const CUMULATIVE_ARGS *, enum machine_mode, tree, int);
-+extern void init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree, int);
-+extern int nios2_setup_incoming_varargs (const CUMULATIVE_ARGS *, enum machine_mode, tree, int);
-+
-+# endif /* TREE_CODE */
-+# endif /* HAVE_MACHINE_MODES */
-+#endif
-+
-+#ifdef TREE_CODE
-+extern int nios2_return_in_memory (tree);
-+
-+#endif /* TREE_CODE */
-diff -durN gcc-3.4.6.orig/gcc/config/nios2/t-nios2 gcc-3.4.6/gcc/config/nios2/t-nios2
---- gcc-3.4.6.orig/gcc/config/nios2/t-nios2 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/config/nios2/t-nios2 2007-08-15 23:09:36.000000000 +0200
-@@ -0,0 +1,123 @@
-+##
-+## Compiler flags to use when compiling libgcc2.c.
-+##
-+## LIB2FUNCS_EXTRA
-+## A list of source file names to be compiled or assembled and inserted into libgcc.a.
-+
-+LIB2FUNCS_EXTRA=$(srcdir)/config/nios2/lib2-divmod.c \
-+ $(srcdir)/config/nios2/lib2-divmod-hi.c \
-+ $(srcdir)/config/nios2/lib2-divtable.c \
-+ $(srcdir)/config/nios2/lib2-mul.c
-+
-+##
-+## Floating Point Emulation
-+## To have GCC include software floating point libraries in libgcc.a define FPBIT
-+## and DPBIT along with a few rules as follows:
-+##
-+## # We want fine grained libraries, so use the new code
-+## # to build the floating point emulation libraries.
-+FPBIT=$(srcdir)/config/nios2/nios2-fp-bit.c
-+DPBIT=$(srcdir)/config/nios2/nios2-dp-bit.c
-+
-+TARGET_LIBGCC2_CFLAGS = -O2
-+
-+# FLOAT_ONLY - no doubles
-+# SMALL_MACHINE - QI/HI is faster than SI
-+# Actually SMALL_MACHINE uses chars and shorts instead of ints
-+# since ints (16-bit ones as they are today) are at least as fast
-+# as chars and shorts, don't define SMALL_MACHINE
-+# CMPtype - type returned by FP compare, i.e. INT (hard coded in fp-bit - see code )
-+
-+$(FPBIT): $(srcdir)/config/fp-bit.c Makefile
-+ echo '#define FLOAT' > ${FPBIT}
-+ cat $(srcdir)/config/fp-bit.c >> ${FPBIT}
-+
-+$(DPBIT): $(srcdir)/config/fp-bit.c Makefile
-+ echo '' > ${DPBIT}
-+ cat $(srcdir)/config/fp-bit.c >> ${DPBIT}
-+
-+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
-+
-+# Assemble startup files.
-+$(T)crti.o: $(srcdir)/config/nios2/crti.asm $(GCC_PASSES)
-+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-+ -c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/nios2/crti.asm
-+
-+$(T)crtn.o: $(srcdir)/config/nios2/crtn.asm $(GCC_PASSES)
-+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-+ -c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/nios2/crtn.asm
-+
-+
-+## You may need to provide additional #defines at the beginning of
-+## fp-bit.c and dp-bit.c to control target endianness and other options
-+##
-+## CRTSTUFF_T_CFLAGS
-+## Special flags used when compiling crtstuff.c. See Initialization.
-+##
-+## CRTSTUFF_T_CFLAGS_S
-+## Special flags used when compiling crtstuff.c for shared linking. Used
-+## if you use crtbeginS.o and crtendS.o in EXTRA-PARTS. See Initialization.
-+##
-+## MULTILIB_OPTIONS
-+## For some targets, invoking GCC in different ways produces objects that
-+## can not be linked together. For example, for some targets GCC produces
-+## both big and little endian code. For these targets, you must arrange
-+## for multiple versions of libgcc.a to be compiled, one for each set of
-+## incompatible options. When GCC invokes the linker, it arranges to link
-+## in the right version of libgcc.a, based on the command line options
-+## used.
-+## The MULTILIB_OPTIONS macro lists the set of options for which special
-+## versions of libgcc.a must be built. Write options that are mutually
-+## incompatible side by side, separated by a slash. Write options that may
-+## be used together separated by a space. The build procedure will build
-+## all combinations of compatible options.
-+##
-+## For example, if you set MULTILIB_OPTIONS to m68000/m68020 msoft-float,
-+## Makefile will build special versions of libgcc.a using the following
-+## sets of options: -m68000, -m68020, -msoft-float, -m68000 -msoft-float,
-+## and -m68020 -msoft-float.
-+
-+MULTILIB_OPTIONS = mno-hw-mul mhw-mulx
-+
-+## MULTILIB_DIRNAMES
-+## If MULTILIB_OPTIONS is used, this variable specifies the directory names
-+## that should be used to hold the various libraries. Write one element in
-+## MULTILIB_DIRNAMES for each element in MULTILIB_OPTIONS. If
-+## MULTILIB_DIRNAMES is not used, the default value will be
-+## MULTILIB_OPTIONS, with all slashes treated as spaces.
-+## For example, if MULTILIB_OPTIONS is set to m68000/m68020 msoft-float,
-+## then the default value of MULTILIB_DIRNAMES is m68000 m68020
-+## msoft-float. You may specify a different value if you desire a
-+## different set of directory names.
-+
-+# MULTILIB_DIRNAMES =
-+
-+## MULTILIB_MATCHES
-+## Sometimes the same option may be written in two different ways. If an
-+## option is listed in MULTILIB_OPTIONS, GCC needs to know about any
-+## synonyms. In that case, set MULTILIB_MATCHES to a list of items of the
-+## form option=option to describe all relevant synonyms. For example,
-+## m68000=mc68000 m68020=mc68020.
-+##
-+## MULTILIB_EXCEPTIONS
-+## Sometimes when there are multiple sets of MULTILIB_OPTIONS being
-+## specified, there are combinations that should not be built. In that
-+## case, set MULTILIB_EXCEPTIONS to be all of the switch exceptions in
-+## shell case syntax that should not be built.
-+## For example, in the PowerPC embedded ABI support, it is not desirable to
-+## build libraries compiled with the -mcall-aix option and either of the
-+## -fleading-underscore or -mlittle options at the same time. Therefore
-+## MULTILIB_EXCEPTIONS is set to
-+##
-+## *mcall-aix/*fleading-underscore* *mlittle/*mcall-aix*
-+##
-+
-+MULTILIB_EXCEPTIONS = *mno-hw-mul/*mhw-mulx*
-+
-+##
-+## MULTILIB_EXTRA_OPTS Sometimes it is desirable that when building
-+## multiple versions of libgcc.a certain options should always be passed on
-+## to the compiler. In that case, set MULTILIB_EXTRA_OPTS to be the list
-+## of options to be used for all builds.
-+##
-+
-diff -durN gcc-3.4.6.orig/gcc/config.gcc gcc-3.4.6/gcc/config.gcc
---- gcc-3.4.6.orig/gcc/config.gcc 2007-08-15 23:07:00.000000000 +0200
-+++ gcc-3.4.6/gcc/config.gcc 2007-08-15 23:09:36.000000000 +0200
-@@ -1342,6 +1342,10 @@
- thread_file='posix'
- fi
- ;;
-+# JBG
-+nios2-*-* | nios2-*-*)
-+ tm_file="elfos.h ${tm_file}"
-+ ;;
- # m68hc11 and m68hc12 share the same machine description.
- m68hc11-*-*|m6811-*-*)
- tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
-diff -durN gcc-3.4.6.orig/gcc/cse.c gcc-3.4.6/gcc/cse.c
---- gcc-3.4.6.orig/gcc/cse.c 2005-12-31 01:39:42.000000000 +0100
-+++ gcc-3.4.6/gcc/cse.c 2007-08-15 23:09:36.000000000 +0200
-@@ -3134,6 +3134,10 @@
- #ifdef FLOAT_STORE_FLAG_VALUE
- REAL_VALUE_TYPE fsfv;
- #endif
-+#ifdef __nios2__
-+ if (p->is_const)
-+ break;
-+#endif
-
- /* If the entry isn't valid, skip it. */
- if (! exp_equiv_p (p->exp, p->exp, 1, 0))
-diff -durN gcc-3.4.6.orig/gcc/doc/extend.texi gcc-3.4.6/gcc/doc/extend.texi
---- gcc-3.4.6.orig/gcc/doc/extend.texi 2005-02-26 23:17:26.000000000 +0100
-+++ gcc-3.4.6/gcc/doc/extend.texi 2007-08-15 23:09:36.000000000 +0200
-@@ -5638,12 +5638,118 @@
- instructions, but allow the compiler to schedule those calls.
-
- @menu
-+* Altera Nios II Built-in Functions::
- * Alpha Built-in Functions::
- * ARM Built-in Functions::
- * X86 Built-in Functions::
- * PowerPC AltiVec Built-in Functions::
- @end menu
-
-+@node Altera Nios II Built-in Functions
-+@subsection Altera Nios II Built-in Functions
-+
-+These built-in functions are available for the Altera Nios II
-+family of processors.
-+
-+The following built-in functions are always available. They
-+all generate the machine instruction that is part of the name.
-+
-+@example
-+int __builtin_ldbio (volatile const void *)
-+int __builtin_ldbuio (volatile const void *)
-+int __builtin_ldhio (volatile const void *)
-+int __builtin_ldhuio (volatile const void *)
-+int __builtin_ldwio (volatile const void *)
-+void __builtin_stbio (volatile void *, int)
-+void __builtin_sthio (volatile void *, int)
-+void __builtin_stwio (volatile void *, int)
-+void __builtin_sync (void)
-+int __builtin_rdctl (int)
-+void __builtin_wrctl (int, int)
-+@end example
-+
-+The following built-in functions are always available. They
-+all generate a Nios II Custom Instruction. The name of the
-+function represents the types that the function takes and
-+returns. The letter before the @code{n} is the return type
-+or void if absent. The @code{n} represnts the first parameter
-+to all the custom instructions, the custom instruction number.
-+The two letters after the @code{n} represent the up to two
-+parameters to the function.
-+
-+The letters reprsent the following data types:
-+@table @code
-+@item <no letter>
-+@code{void} for return type and no parameter for parameter types.
-+
-+@item i
-+@code{int} for return type and parameter type
-+
-+@item f
-+@code{float} for return type and parameter type
-+
-+@item p
-+@code{void *} for return type and parameter type
-+
-+@end table
-+
-+And the function names are:
-+@example
-+void __builtin_custom_n (void)
-+void __builtin_custom_ni (int)
-+void __builtin_custom_nf (float)
-+void __builtin_custom_np (void *)
-+void __builtin_custom_nii (int, int)
-+void __builtin_custom_nif (int, float)
-+void __builtin_custom_nip (int, void *)
-+void __builtin_custom_nfi (float, int)
-+void __builtin_custom_nff (float, float)
-+void __builtin_custom_nfp (float, void *)
-+void __builtin_custom_npi (void *, int)
-+void __builtin_custom_npf (void *, float)
-+void __builtin_custom_npp (void *, void *)
-+int __builtin_custom_in (void)
-+int __builtin_custom_ini (int)
-+int __builtin_custom_inf (float)
-+int __builtin_custom_inp (void *)
-+int __builtin_custom_inii (int, int)
-+int __builtin_custom_inif (int, float)
-+int __builtin_custom_inip (int, void *)
-+int __builtin_custom_infi (float, int)
-+int __builtin_custom_inff (float, float)
-+int __builtin_custom_infp (float, void *)
-+int __builtin_custom_inpi (void *, int)
-+int __builtin_custom_inpf (void *, float)
-+int __builtin_custom_inpp (void *, void *)
-+float __builtin_custom_fn (void)
-+float __builtin_custom_fni (int)
-+float __builtin_custom_fnf (float)
-+float __builtin_custom_fnp (void *)
-+float __builtin_custom_fnii (int, int)
-+float __builtin_custom_fnif (int, float)
-+float __builtin_custom_fnip (int, void *)
-+float __builtin_custom_fnfi (float, int)
-+float __builtin_custom_fnff (float, float)
-+float __builtin_custom_fnfp (float, void *)
-+float __builtin_custom_fnpi (void *, int)
-+float __builtin_custom_fnpf (void *, float)
-+float __builtin_custom_fnpp (void *, void *)
-+void * __builtin_custom_pn (void)
-+void * __builtin_custom_pni (int)
-+void * __builtin_custom_pnf (float)
-+void * __builtin_custom_pnp (void *)
-+void * __builtin_custom_pnii (int, int)
-+void * __builtin_custom_pnif (int, float)
-+void * __builtin_custom_pnip (int, void *)
-+void * __builtin_custom_pnfi (float, int)
-+void * __builtin_custom_pnff (float, float)
-+void * __builtin_custom_pnfp (float, void *)
-+void * __builtin_custom_pnpi (void *, int)
-+void * __builtin_custom_pnpf (void *, float)
-+void * __builtin_custom_pnpp (void *, void *)
-+@end example
-+
-+
- @node Alpha Built-in Functions
- @subsection Alpha Built-in Functions
-
-diff -durN gcc-3.4.6.orig/gcc/doc/invoke.texi gcc-3.4.6/gcc/doc/invoke.texi
---- gcc-3.4.6.orig/gcc/doc/invoke.texi 2005-10-08 02:22:20.000000000 +0200
-+++ gcc-3.4.6/gcc/doc/invoke.texi 2007-08-15 23:09:36.000000000 +0200
-@@ -337,6 +337,14 @@
- @item Machine Dependent Options
- @xref{Submodel Options,,Hardware Models and Configurations}.
-
-+@emph{Altera Nios II Options}
-+@gccoptlist{-msmallc -mno-bypass-cache -mbypass-cache @gol
-+-mno-cache-volatile -mcache-volatile -mno-inline-memcpy @gol
-+-minline-memcpy -mno-fast-sw-div -mfast-sw-div @gol
-+-mhw-mul -mno-hw-mul -mhw-mulx -mno-hw-mulx @gol
-+-mno-hw-div -mhw-div @gol
-+-msys-crt0= -msys-lib= -msys=nosys }
-+
- @emph{M680x0 Options}
- @gccoptlist{-m68000 -m68020 -m68020-40 -m68020-60 -m68030 -m68040 @gol
- -m68060 -mcpu32 -m5200 -m68881 -mbitfield -mc68000 -mc68020 @gol
-@@ -5839,6 +5847,7 @@
- that macro, which enables you to change the defaults.
-
- @menu
-+* Altera Nios II Options::
- * M680x0 Options::
- * M68hc1x Options::
- * VAX Options::
-@@ -5874,6 +5883,103 @@
- * FRV Options::
- @end menu
-
-+
-+@node Altera Nios II Options
-+@subsection Altera Nios II Options
-+@cindex Altera Nios II options
-+
-+These are the @samp{-m} options defined for the Altera Nios II
-+processor.
-+
-+@table @gcctabopt
-+
-+@item -msmallc
-+@opindex msmallc
-+
-+Link with a limited version of the C library, -lsmallc. For more
-+information see the C Library Documentation.
-+
-+
-+@item -mbypass-cache
-+@itemx -mno-bypass-cache
-+@opindex mno-bypass-cache
-+@opindex mbypass-cache
-+
-+Force all load and store instructions to always bypass cache by
-+using io variants of the instructions. The default is to not
-+bypass the cache.
-+
-+@item -mno-cache-volatile
-+@itemx -mcache-volatile
-+@opindex mcache-volatile
-+@opindex mno-cache-volatile
-+
-+Volatile memory access bypass the cache using the io variants of
-+the ld and st instructions. The default is to cache volatile
-+accesses.
-+
-+-mno-cache-volatile is deprecated and will be deleted in a
-+future GCC release.
-+
-+
-+@item -mno-inline-memcpy
-+@itemx -minline-memcpy
-+@opindex mno-inline-memcpy
-+@opindex minline-memcpy
-+
-+Do not inline memcpy. The default is to inline when -O is on.
-+
-+
-+@item -mno-fast-sw-div
-+@itemx -mfast-sw-div
-+@opindex mno-fast-sw-div
-+@opindex mfast-sw-div
-+
-+Do no use table based fast divide for small numbers. The default
-+is to use the fast divide at -O3 and above.
-+
-+
-+@item -mno-hw-mul
-+@itemx -mhw-mul
-+@itemx -mno-hw-mulx
-+@itemx -mhw-mulx
-+@itemx -mno-hw-div
-+@itemx -mhw-div
-+@opindex mno-hw-mul
-+@opindex mhw-mul
-+@opindex mno-hw-mulx
-+@opindex mhw-mulx
-+@opindex mno-hw-div
-+@opindex mhw-div
-+
-+Enable or disable emitting @code{mul}, @code{mulx} and @code{div} family of
-+instructions by the compiler. The default is to emit @code{mul}
-+and not emit @code{div} and @code{mulx}.
-+
-+The different combinations of @code{mul} and @code{mulx} instructions
-+generate a different multilib options.
-+
-+
-+@item -msys-crt0=@var{startfile}
-+@opindex msys-crt0
-+
-+@var{startfile} is the file name of the startfile (crt0) to use
-+when linking. The default is crt0.o that comes with libgloss
-+and is only suitable for use with the instruction set
-+simulator.
-+
-+@item -msys-lib=@var{systemlib}
-+@itemx -msys-lib=nosys
-+@opindex msys-lib
-+
-+@var{systemlib} is the library name of the library which provides
-+the system calls required by the C library, e.g. @code{read}, @code{write}
-+etc. The default is to use nosys, this library provides
-+stub implementations of the calls and is part of libgloss.
-+
-+@end table
-+
-+
- @node M680x0 Options
- @subsection M680x0 Options
- @cindex M680x0 options
-diff -durN gcc-3.4.6.orig/gcc/doc/md.texi gcc-3.4.6/gcc/doc/md.texi
---- gcc-3.4.6.orig/gcc/doc/md.texi 2004-11-13 23:31:42.000000000 +0100
-+++ gcc-3.4.6/gcc/doc/md.texi 2007-08-15 23:09:36.000000000 +0200
-@@ -1337,6 +1337,49 @@
- available on some particular machines.
-
- @table @emph
-+
-+@item Altera Nios II family---@file{nios2.h}
-+@table @code
-+
-+@item I
-+Integer that is valid as an immediate operand in an
-+instruction taking a signed 16-bit number. Range
-+@minus{}32768 to 32767.
-+
-+@item J
-+Integer that is valid as an immediate operand in an
-+instruction taking an unsigned 16-bit number. Range
-+0 to 65535.
-+
-+@item K
-+Integer that is valid as an immediate operand in an
-+instruction taking only the upper 16-bits of a
-+32-bit number. Range 32-bit numbers with the lower
-+16-bits being 0.
-+
-+@item L
-+Integer that is valid as an immediate operand for a
-+shift instruction. Range 0 to 31.
-+
-+
-+@item M
-+Integer that is valid as an immediate operand for
-+only the value 0. Can be used in conjunction with
-+the format modifier @code{z} to use @code{r0}
-+instead of @code{0} in the assembly output.
-+
-+@item N
-+Integer that is valid as an immediate operand for
-+a custom instruction opcode. Range 0 to 255.
-+
-+@item S
-+Matches immediates which are addresses in the small
-+data section and therefore can be added to @code{gp}
-+as a 16-bit immediate to re-create their 32-bit value.
-+
-+@end table
-+
-+
- @item ARM family---@file{arm.h}
- @table @code
- @item f
-diff -durN gcc-3.4.6.orig/gcc/Makefile.in gcc-3.4.6/gcc/Makefile.in
---- gcc-3.4.6.orig/gcc/Makefile.in 2005-02-24 10:26:59.000000000 +0100
-+++ gcc-3.4.6/gcc/Makefile.in 2007-08-15 23:09:36.000000000 +0200
-@@ -3094,7 +3094,7 @@
- $(INSTALL_DATA) $(srcdir)/README-fixinc \
- $(DESTDIR)$(itoolsdatadir)/include/README ; \
- $(INSTALL_SCRIPT) fixinc.sh $(DESTDIR)$(itoolsdir)/fixinc.sh ; \
-- $(INSTALL_PROGRAM) fixinc/fixincl $(DESTDIR)$(itoolsdir)/fixincl ; \
-+ $(INSTALL_PROGRAM) fixinc/fixincl$(build_exeext) $(DESTDIR)$(itoolsdir)/fixincl$(build_exeext) ; \
- $(INSTALL_DATA) $(srcdir)/gsyslimits.h \
- $(DESTDIR)$(itoolsdatadir)/gsyslimits.h ; \
- else :; fi
diff --git a/patches/gcc/3.4.6/260-arm-softfloat.patch b/patches/gcc/3.4.6/260-arm-softfloat.patch
deleted file mode 100644
index b0ef614..0000000
--- a/patches/gcc/3.4.6/260-arm-softfloat.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -durN gcc-3.4.6.orig/gcc/config/arm/coff.h gcc-3.4.6/gcc/config/arm/coff.h
---- gcc-3.4.6.orig/gcc/config/arm/coff.h 2004-02-24 15:25:22.000000000 +0100
-+++ gcc-3.4.6/gcc/config/arm/coff.h 2007-08-15 23:10:54.000000000 +0200
-@@ -31,11 +31,16 @@
- #define TARGET_VERSION fputs (" (ARM/coff)", stderr)
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT \
-+ ( ARM_FLAG_SOFT_FLOAT \
-+ | ARM_FLAG_VFP \
-+ | ARM_FLAG_APCS_32 \
-+ | ARM_FLAG_APCS_FRAME \
-+ | ARM_FLAG_MMU_TRAPS )
-
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork" }
-+ { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork" }
- #endif
-
- /* This is COFF, but prefer stabs. */
-diff -durN gcc-3.4.6.orig/gcc/config/arm/elf.h gcc-3.4.6/gcc/config/arm/elf.h
---- gcc-3.4.6.orig/gcc/config/arm/elf.h 2004-02-24 15:25:22.000000000 +0100
-+++ gcc-3.4.6/gcc/config/arm/elf.h 2007-08-15 23:10:54.000000000 +0200
-@@ -46,7 +46,9 @@
-
- #ifndef SUBTARGET_ASM_FLOAT_SPEC
- #define SUBTARGET_ASM_FLOAT_SPEC "\
--%{mapcs-float:-mfloat} %{msoft-float:-mfpu=softfpa}"
-+%{mapcs-float:-mfloat} \
-+%{mhard-float:-mfpu=fpa} \
-+%{!mhard-float: %{msoft-float:-mfpu=softfpa} %{!msoft-float:-mfpu=softvfp}}"
- #endif
-
- #ifndef ASM_SPEC
-@@ -106,12 +108,17 @@
- #endif
-
- #ifndef TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT \
-+ ( ARM_FLAG_SOFT_FLOAT \
-+ | ARM_FLAG_VFP \
-+ | ARM_FLAG_APCS_32 \
-+ | ARM_FLAG_APCS_FRAME \
-+ | ARM_FLAG_MMU_TRAPS )
- #endif
-
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" }
-+ { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" }
- #endif
-
- #define TARGET_ASM_FILE_START_APP_OFF true
-diff -durN gcc-3.4.6.orig/gcc/config/arm/linux-elf.h gcc-3.4.6/gcc/config/arm/linux-elf.h
---- gcc-3.4.6.orig/gcc/config/arm/linux-elf.h 2007-08-15 23:07:00.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/linux-elf.h 2007-08-15 23:10:54.000000000 +0200
-@@ -44,12 +44,26 @@
- #define TARGET_LINKER_EMULATION "armelf_linux"
- #endif
-
--/* Default is to use APCS-32 mode. */
-+/*
-+ * Default is to use APCS-32 mode with soft-vfp.
-+ * The old Linux default for floats can be achieved with -mhard-float
-+ * or with the configure --with-float=hard option.
-+ * If -msoft-float or --with-float=soft is used then software float
-+ * support will be used just like the default but with the legacy
-+ * big endian word ordering for double float representation instead.
-+ */
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT \
-- ( ARM_FLAG_APCS_32 | \
-- ARM_FLAG_MMU_TRAPS | \
-- TARGET_ENDIAN_DEFAULT )
-+#define TARGET_DEFAULT \
-+ ( ARM_FLAG_APCS_32 \
-+ | ARM_FLAG_SOFT_FLOAT \
-+ | TARGET_ENDIAN_DEFAULT \
-+ | ARM_FLAG_VFP \
-+ | ARM_FLAG_MMU_TRAPS )
-+
-+#undef SUBTARGET_EXTRA_ASM_SPEC
-+#define SUBTARGET_EXTRA_ASM_SPEC "\
-+%{mhard-float:-mfpu=fpa} \
-+%{!mhard-float: %{msoft-float:-mfpu=softfpa} %{!msoft-float:-mfpu=softvfp}}"
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
-@@ -57,7 +71,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mapcs-32", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mapcs-32", "mno-thumb-interwork" }
-
- #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
-
-@@ -72,7 +86,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add
- the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
-diff -durN gcc-3.4.6.orig/gcc/config/arm/t-linux gcc-3.4.6/gcc/config/arm/t-linux
---- gcc-3.4.6.orig/gcc/config/arm/t-linux 2003-09-20 23:09:07.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/t-linux 2007-08-15 23:10:54.000000000 +0200
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-diff -durN gcc-3.4.6.orig/gcc/config/arm/unknown-elf.h gcc-3.4.6/gcc/config/arm/unknown-elf.h
---- gcc-3.4.6.orig/gcc/config/arm/unknown-elf.h 2004-02-24 15:25:22.000000000 +0100
-+++ gcc-3.4.6/gcc/config/arm/unknown-elf.h 2007-08-15 23:10:54.000000000 +0200
-@@ -30,7 +30,12 @@
-
- /* Default to using APCS-32 and software floating point. */
- #ifndef TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT \
-+ ( ARM_FLAG_SOFT_FLOAT \
-+ | ARM_FLAG_VFP \
-+ | ARM_FLAG_APCS_32 \
-+ | ARM_FLAG_APCS_FRAME \
-+ | ARM_FLAG_MMU_TRAPS )
- #endif
-
- /* Now we define the strings used to build the spec file. */
-diff -durN gcc-3.4.6.orig/gcc/config/arm/xscale-elf.h gcc-3.4.6/gcc/config/arm/xscale-elf.h
---- gcc-3.4.6.orig/gcc/config/arm/xscale-elf.h 2003-07-02 01:26:43.000000000 +0200
-+++ gcc-3.4.6/gcc/config/arm/xscale-elf.h 2007-08-15 23:10:54.000000000 +0200
-@@ -49,11 +49,12 @@
- endian, regardless of the endian-ness of the memory
- system. */
-
--#define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mcpu=xscale} \
-- %{mhard-float:-mfpu=fpa} \
-- %{!mhard-float: %{msoft-float:-mfpu=softfpa;:-mfpu=softvfp}}"
-+#define SUBTARGET_EXTRA_ASM_SPEC "\
-+%{!mcpu=*:-mcpu=xscale} \
-+%{mhard-float:-mfpu=fpa} \
-+%{!mhard-float: %{msoft-float:-mfpu=softfpa} %{!msoft-float:-mfpu=softvfp}}"
-
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "mlittle-endian", "mno-thumb-interwork", "marm", "msoft-float" }
-+ { "mlittle-endian", "mno-thumb-interwork", "marm" }
- #endif
diff --git a/patches/gcc/4.0.4/100-uclibc-conf.patch b/patches/gcc/4.0.4/100-uclibc-conf.patch
deleted file mode 100644
index 3be7d09..0000000
--- a/patches/gcc/4.0.4/100-uclibc-conf.patch
+++ /dev/null
@@ -1,553 +0,0 @@
---- gcc-4.0.2/gcc/config/t-linux-uclibc
-+++ gcc-4.0.2/gcc/config/t-linux-uclibc
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
---- gcc-4.0.2/gcc/config.gcc
-+++ gcc-4.0.2/gcc/config.gcc
-@@ -1778,7 +1778,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-@@ -2234,10 +2234,16 @@
- *)
- echo "*** Configuration ${target} not supported" 1>&2
- exit 1
- ;;
- esac
-+
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
-+esac
-
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
- ;;
---- gcc-4.0.2/gcc/config/alpha/linux-elf.h
-+++ gcc-4.0.2/gcc/config/alpha/linux-elf.h
-@@ -27,7 +27,11 @@
- #define SUBTARGET_EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
- #define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
-
- #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
---- gcc-4.0.2/gcc/config/arm/linux-elf.h
-+++ gcc-4.0.2/gcc/config/arm/linux-elf.h
-@@ -81,14 +81,19 @@
- #define ENDFILE_SPEC \
- "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "%{h*} %{version:-v} \
- %{b} %{Wl,*:%*} \
- %{static:-Bstatic} \
- %{shared:-shared} \
- %{symbolic:-Bsymbolic} \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
- -X \
- %{mbig-endian:-EB}" \
- SUBTARGET_EXTRA_LINK_SPEC
---- gcc-4.0.2/gcc/config/cris/linux.h
-+++ gcc-4.0.2/gcc/config/cris/linux.h
-@@ -79,6 +79,25 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
-+#ifdef USE_UCLIBC
-+
-+#undef CRIS_SUBTARGET_VERSION
-+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+
-+#undef CRIS_LINK_SUBTARGET_SPEC
-+#define CRIS_LINK_SUBTARGET_SPEC \
-+ "-mcrislinux\
-+ -rpath-link include/asm/../..%s\
-+ %{shared} %{static}\
-+ %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
-+ %{!shared: \
-+ %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
-+ %{!r:%{O2|O3: --gc-sections}}"
-+
-+#else /* USE_UCLIBC */
-+
- #undef CRIS_SUBTARGET_VERSION
- #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-
-@@ -93,6 +112,8 @@
- %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
- %{!r:%{O2|O3: --gc-sections}}"
-
-+#endif /* USE_UCLIBC */
-+
-
- /* Node: Run-time Target */
-
---- gcc-4.0.2/gcc/config/i386/linux.h
-+++ gcc-4.0.2/gcc/config/i386/linux.h
-@@ -107,6 +107,11 @@
- #define LINK_EMULATION "elf_i386"
- #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-+#ifdef USE_UCLIBC
-+#undef DYNAMIC_LINKER
-+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#endif
-+
- #undef SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
- { "link_emulation", LINK_EMULATION },\
---- gcc-4.0.2/gcc/config/i386/linux64.h
-+++ gcc-4.0.2/gcc/config/i386/linux64.h
-@@ -54,14 +54,21 @@
- When the -shared link option is used a final link is not being
- done. */
-
-+#ifdef USE_UCLIBC
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
-+ %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
-+ %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
- %{static:-static}}"
-
- #define MULTILIB_DEFAULTS { "m64" }
---- gcc-4.0.2/gcc/config/ia64/linux.h
-+++ gcc-4.0.2/gcc/config/ia64/linux.h
-@@ -37,13 +37,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
-
---- gcc-4.0.2/gcc/config/m68k/linux.h
-+++ gcc-4.0.2/gcc/config/m68k/linux.h
-@@ -127,12 +127,17 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static}}"
-
- /* For compatibility with linux/a.out */
---- gcc-4.0.2/gcc/config/mips/linux.h
-+++ gcc-4.0.2/gcc/config/mips/linux.h
-@@ -108,14 +108,19 @@
-
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #define LINK_SPEC \
- "%(endian_spec) \
- %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
-
- #undef SUBTARGET_ASM_SPEC
---- gcc-4.0.2/gcc/config/pa/pa-linux.h
-+++ gcc-4.0.2/gcc/config/pa/pa-linux.h
-@@ -82,13 +82,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
- /* glibc's profiling functions don't need gcc to allocate counters. */
---- gcc-4.0.2/gcc/config/rs6000/linux.h
-+++ gcc-4.0.2/gcc/config/rs6000/linux.h
-@@ -69,7 +69,11 @@
- #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
-
- #undef LINK_OS_DEFAULT_SPEC
-+#ifdef USE_UCLIBC
-+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
-+#else
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-+#endif
-
- #define LINK_GCC_C_SEQUENCE_SPEC \
- "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
---- gcc-4.0.2/gcc/config/rs6000/sysv4.h
-+++ gcc-4.0.2/gcc/config/rs6000/sysv4.h
-@@ -949,6 +949,7 @@
- mcall-linux : %(link_os_linux) ; \
- mcall-gnu : %(link_os_gnu) ; \
- mcall-netbsd : %(link_os_netbsd) ; \
-+ mcall-linux-uclibc : %(link_os_linux_uclibc); \
- mcall-openbsd: %(link_os_openbsd) ; \
- : %(link_os_default) }"
-
-@@ -1127,6 +1128,10 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-
-+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
-+
- #if defined(HAVE_LD_EH_FRAME_HDR)
- # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
- #endif
-@@ -1293,6 +1298,7 @@
- { "link_os_sim", LINK_OS_SIM_SPEC }, \
- { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
- { "link_os_linux", LINK_OS_LINUX_SPEC }, \
-+ { "link_os_linux_uclibc", LINK_OS_LINUX_UCLIBC_SPEC }, \
- { "link_os_gnu", LINK_OS_GNU_SPEC }, \
- { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
---- gcc-4.0.2/gcc/config/s390/linux.h
-+++ gcc-4.0.2/gcc/config/s390/linux.h
-@@ -77,6 +77,13 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
-
-+#ifdef USE_UCLIBC
-+#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC \
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-@@ -86,8 +93,8 @@
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker: \
-- %{m31:-dynamic-linker /lib/ld.so.1} \
-- %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
-+ %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
-+ %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
-
-
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
---- gcc-4.0.2/gcc/config/sh/linux.h
-+++ gcc-4.0.2/gcc/config/sh/linux.h
-@@ -67,11 +67,16 @@
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
- #undef SUBTARGET_LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define SUBTARGET_LINK_SPEC \
- "%{shared:-shared} \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}"
-
- #undef LIB_SPEC
---- gcc-4.0.2/gcc/config/sparc/linux.h
-+++ gcc-4.0.2/gcc/config/sparc/linux.h
-@@ -130,14 +130,19 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
-
- /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
---- gcc-4.0.2/gcc/config/sparc/linux64.h
-+++ gcc-4.0.2/gcc/config/sparc/linux64.h
-@@ -167,12 +166,17 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}} \
- "
-
---- gcc-4.0.2/libtool.m4
-+++ gcc-4.0.2/libtool.m4
-@@ -682,6 +682,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
---- gcc-4.0.2/ltconfig
-+++ gcc-4.0.2/ltconfig
-@@ -603,6 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
-+linux-uclibc*) ;;
- linux-gnu*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-@@ -1274,6 +1275,23 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # 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
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- need_lib_prefix=no
- need_version=no
---- gcc-4.0.2/libffi/configure
-+++ gcc-4.0.2/libffi/configure
-@@ -3457,6 +3457,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/libgfortran/configure
-+++ gcc-4.0.2/libgfortran/configure
-@@ -3681,6 +3681,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/libjava/configure
-+++ gcc-4.0.2/libjava/configure
-@@ -4351,6 +4351,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/libmudflap/configure
-+++ gcc-4.0.2/libmudflap/configure
-@@ -5380,6 +5380,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/libobjc/configure
-+++ gcc-4.0.2/libobjc/configure
-@@ -3283,6 +3283,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/boehm-gc/configure
-+++ gcc-4.0.2/boehm-gc/configure
-@@ -4320,6 +4320,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.0.2/configure
-+++ gcc-4.0.2/configure
-@@ -1141,7 +1141,7 @@
- ;;
- "")
- case "${target}" in
-- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
- # Enable libmudflap by default in GNU and friends.
- ;;
- *-*-freebsd*)
---- gcc-4.0.2/configure.in
-+++ gcc-4.0.2/configure.in
-@@ -350,7 +350,7 @@
- ;;
- "")
- case "${target}" in
-- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
- # Enable libmudflap by default in GNU and friends.
- ;;
- *-*-freebsd*)
---- gcc-4.0.2/contrib/regression/objs-gcc.sh
-+++ gcc-4.0.2/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
---- gcc-4.0.2/zlib/configure
-+++ gcc-4.0.2/zlib/configure
-@@ -3426,6 +3426,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff --git a/patches/gcc/4.0.4/110-uclibc-locale.patch b/patches/gcc/4.0.4/110-uclibc-locale.patch
deleted file mode 100644
index ac4cf97..0000000
--- a/patches/gcc/4.0.4/110-uclibc-locale.patch
+++ /dev/null
@@ -1,3237 +0,0 @@
-diff -urN gcc-4.0.0-100/libstdc++-v3/acinclude.m4 gcc-4.0.0/libstdc++-v3/acinclude.m4
---- gcc-4.0.0-100/libstdc++-v3/acinclude.m4 2005-04-30 13:06:53.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/acinclude.m4 2005-04-28 20:19:01.000000000 -0500
-@@ -1104,7 +1104,7 @@
- AC_MSG_CHECKING([for C locale to use])
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # If they didn't use this option switch, or if they specified --enable
- # with no specific model, we'll have to look for one. If they
-@@ -1120,6 +1120,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1263,6 +1266,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,59 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#endif // GLIBC 2.3 and later
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.h 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,115 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out, const int __size, const char* __fmt,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/collate_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/collate_members.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.h 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2005-04-28 01:23:02.000000000 -0500
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ __ret = pattern();
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2005-04-28 01:20:20.000000000 -0500
-@@ -0,0 +1,173 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.cc 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.cc 2005-04-28 01:13:15.000000000 -0500
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.h 2004-05-22 18:46:31.000000000 -0500
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_base.h
---- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_base.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_base.h 2005-04-28 01:10:27.000000000 -0500
-@@ -0,0 +1,64 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+/** @file ctype_base.h
-+ * This is an internal header file, included by other library headers.
-+ * You should not attempt to use it directly.
-+ */
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ /// @brief Base class for ctype.
-+ struct ctype_base
-+ {
-+ // Note: In uClibc, the following two types depend on configuration.
-+
-+ // Non-standard typedefs.
-+ typedef const __ctype_touplow_t* __to_type;
-+
-+ // NB: Offsets into ctype<char>::_M_table force a particular size
-+ // on the mask type. Because of this, we don't use an enum.
-+ typedef __ctype_mask_t mask;
-+ static const mask upper = _ISupper;
-+ static const mask lower = _ISlower;
-+ static const mask alpha = _ISalpha;
-+ static const mask digit = _ISdigit;
-+ static const mask xdigit = _ISxdigit;
-+ static const mask space = _ISspace;
-+ static const mask print = _ISprint;
-+ static const mask graph = _ISalpha | _ISdigit | _ISpunct;
-+ static const mask cntrl = _IScntrl;
-+ static const mask punct = _ISpunct;
-+ static const mask alnum = _ISalpha | _ISdigit;
-+ };
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_inline.h
---- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_inline.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_inline.h 2002-06-24 00:49:19.000000000 -0500
-@@ -0,0 +1,69 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-+// functions go in ctype.cc
-+
-+ bool
-+ ctype<char>::
-+ is(mask __m, char __c) const
-+ { return _M_table[static_cast<unsigned char>(__c)] & __m; }
-+
-+ const char*
-+ ctype<char>::
-+ is(const char* __low, const char* __high, mask* __vec) const
-+ {
-+ while (__low < __high)
-+ *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
-+ return __high;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_is(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
-+ ++__low;
-+ return __low;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_not(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
-+ ++__low;
-+ return __low;
-+ }
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h
---- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2005-04-28 01:10:27.000000000 -0500
-@@ -0,0 +1,92 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ const ctype_base::mask*
-+ ctype<char>::classic_table() throw()
-+ { return __C_ctype_b; }
-+
-+ ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ char
-+ ctype<char>::do_toupper(char __c) const
-+ { return _M_toupper[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_toupper(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_toupper[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
-+
-+ char
-+ ctype<char>::do_tolower(char __c) const
-+ { return _M_tolower[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_tolower(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_tolower[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
-diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/os_defines.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/os_defines.h
---- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/os_defines.h 1969-12-31 18:00:00.000000000 -0600
-+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/os_defines.h 2005-04-28 01:10:27.000000000 -0500
-@@ -0,0 +1,44 @@
-+// Specific definitions for GNU/Linux -*- C++ -*-
-+
-+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+#ifndef _GLIBCXX_OS_DEFINES
-+#define _GLIBCXX_OS_DEFINES 1
-+
-+// System-specific #define, typedefs, corrections, etc, go here. This
-+// file will come before all others.
-+
-+// This keeps isanum, et al from being propagated as macros.
-+#define __NO_CTYPE 1
-+
-+#include <features.h>
-+
-+// We must not see the optimized string functions GNU libc defines.
-+#define __NO_STRING_INLINES
-+
-+#endif
-diff -urN gcc-4.0.0-100/libstdc++-v3/configure gcc-4.0.0/libstdc++-v3/configure
---- gcc-4.0.0-100/libstdc++-v3/configure 2005-04-30 13:06:53.683055232 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 12:24:24.000000000 -0500
-@@ -3998,6 +3998,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -5672,7 +5677,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5697,6 +5702,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5927,6 +5935,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -urN gcc-4.0.0-100/libstdc++-v3/configure.host gcc-4.0.0/libstdc++-v3/configure.host
---- gcc-4.0.0-100/libstdc++-v3/configure.host 2005-04-30 13:06:53.688054472 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure.host 2005-04-28 20:20:32.000000000 -0500
-@@ -249,6 +249,12 @@
- ;;
- esac
-
-+# Override for uClibc since linux-uclibc gets mishandled above.
-+case "${host_os}" in
-+ *-uclibc*)
-+ os_include_dir="os/uclibc"
-+ ;;
-+esac
-
- # Set any OS-dependent and CPU-dependent bits.
- # THIS TABLE IS SORTED. KEEP IT THAT WAY.
-diff -urN gcc-4.0.0-100/libstdc++-v3/crossconfig.m4 gcc-4.0.0/libstdc++-v3/crossconfig.m4
---- gcc-4.0.0-100/libstdc++-v3/crossconfig.m4 2005-04-30 13:06:53.689054320 -0500
-+++ gcc-4.0.0/libstdc++-v3/crossconfig.m4 2005-04-28 20:27:15.000000000 -0500
-@@ -142,6 +142,98 @@
- ;;
- esac
- ;;
-+ *-uclibc*)
-+# Temporary hack until we implement the float versions of the libm funcs
-+ AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-+ machine/endian.h machine/param.h sys/machine.h sys/types.h \
-+ fp.h float.h endian.h inttypes.h locale.h float.h stdint.h])
-+ SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+ AC_SUBST(SECTION_FLAGS)
-+ GLIBCXX_CHECK_LINKER_FEATURES
-+ GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-+ GLIBCXX_CHECK_WCHAR_T_SUPPORT
-+
-+ # For LFS.
-+ AC_DEFINE(HAVE_INT64_T)
-+ case "$target" in
-+ *-uclinux*)
-+ # Don't enable LFS with uClinux
-+ ;;
-+ *)
-+ AC_DEFINE(_GLIBCXX_USE_LFS)
-+ esac
-+
-+ # For showmanyc_helper().
-+ AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
-+ GLIBCXX_CHECK_POLL
-+ GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
-+
-+ # For xsputn_2().
-+ AC_CHECK_HEADERS(sys/uio.h)
-+ GLIBCXX_CHECK_WRITEV
-+
-+# AC_DEFINE(HAVE_ACOSF)
-+# AC_DEFINE(HAVE_ASINF)
-+# AC_DEFINE(HAVE_ATANF)
-+# AC_DEFINE(HAVE_ATAN2F)
-+ AC_DEFINE(HAVE_CEILF)
-+ AC_DEFINE(HAVE_COPYSIGN)
-+# AC_DEFINE(HAVE_COPYSIGNF)
-+# AC_DEFINE(HAVE_COSF)
-+# AC_DEFINE(HAVE_COSHF)
-+# AC_DEFINE(HAVE_EXPF)
-+# AC_DEFINE(HAVE_FABSF)
-+ AC_DEFINE(HAVE_FINITE)
-+ AC_DEFINE(HAVE_FINITEF)
-+ AC_DEFINE(HAVE_FLOORF)
-+# AC_DEFINE(HAVE_FMODF)
-+# AC_DEFINE(HAVE_FREXPF)
-+ AC_DEFINE(HAVE_HYPOT)
-+# AC_DEFINE(HAVE_HYPOTF)
-+ AC_DEFINE(HAVE_ISINF)
-+ AC_DEFINE(HAVE_ISINFF)
-+ AC_DEFINE(HAVE_ISNAN)
-+ AC_DEFINE(HAVE_ISNANF)
-+# AC_DEFINE(HAVE_LOGF)
-+# AC_DEFINE(HAVE_LOG10F)
-+# AC_DEFINE(HAVE_MODFF)
-+# AC_DEFINE(HAVE_SINF)
-+# AC_DEFINE(HAVE_SINHF)
-+# AC_DEFINE(HAVE_SINCOS)
-+# AC_DEFINE(HAVE_SINCOSF)
-+ AC_DEFINE(HAVE_SQRTF)
-+# AC_DEFINE(HAVE_TANF)
-+# AC_DEFINE(HAVE_TANHF)
-+ if test x"long_double_math_on_this_cpu" = x"yes"; then
-+# AC_DEFINE(HAVE_ACOSL)
-+# AC_DEFINE(HAVE_ASINL)
-+# AC_DEFINE(HAVE_ATANL)
-+# AC_DEFINE(HAVE_ATAN2L)
-+# AC_DEFINE(HAVE_CEILL)
-+# AC_DEFINE(HAVE_COPYSIGNL)
-+# AC_DEFINE(HAVE_COSL)
-+# AC_DEFINE(HAVE_COSHL)
-+# AC_DEFINE(HAVE_EXPL)
-+# AC_DEFINE(HAVE_FABSL)
-+# AC_DEFINE(HAVE_FINITEL)
-+# AC_DEFINE(HAVE_FLOORL)
-+# AC_DEFINE(HAVE_FMODL)
-+# AC_DEFINE(HAVE_FREXPL)
-+# AC_DEFINE(HAVE_HYPOTL)
-+# AC_DEFINE(HAVE_ISINFL)
-+# AC_DEFINE(HAVE_ISNANL)
-+# AC_DEFINE(HAVE_LOGL)
-+# AC_DEFINE(HAVE_LOG10L)
-+# AC_DEFINE(HAVE_MODFL)
-+# AC_DEFINE(HAVE_POWL)
-+# AC_DEFINE(HAVE_SINL)
-+# AC_DEFINE(HAVE_SINHL)
-+# AC_DEFINE(HAVE_SINCOSL)
-+# AC_DEFINE(HAVE_SQRTL)
-+# AC_DEFINE(HAVE_TANL)
-+# AC_DEFINE(HAVE_TANHL)
-+ fi
-+ ;;
- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
- AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
- machine/endian.h machine/param.h sys/machine.h sys/types.h \
-@@ -156,7 +248,7 @@
- AC_DEFINE(HAVE_INT64_T)
- case "$target" in
- *-uclinux*)
-- # Don't enable LFS with uClibc
-+ # Don't enable LFS with uClinux
- ;;
- *)
- AC_DEFINE(_GLIBCXX_USE_LFS)
-diff -urN gcc-4.0.0-100/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.0.0/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-4.0.0-100/libstdc++-v3/include/c_compatibility/wchar.h 2005-04-30 13:06:53.690054168 -0500
-+++ gcc-4.0.0/libstdc++-v3/include/c_compatibility/wchar.h 2005-04-28 20:15:56.000000000 -0500
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-diff -urN gcc-4.0.0-100/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.0.0/libstdc++-v3/include/c_std/std_cwchar.h
---- gcc-4.0.0-100/libstdc++-v3/include/c_std/std_cwchar.h 2005-04-30 13:06:53.691054016 -0500
-+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cwchar.h 2005-04-28 20:15:56.000000000 -0500
-@@ -179,7 +179,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.0.4/120-libstdc++-pic.patch b/patches/gcc/4.0.4/120-libstdc++-pic.patch
deleted file mode 100644
index a9d6e71..0000000
--- a/patches/gcc/4.0.4/120-libstdc++-pic.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/src/Makefile.am
-+++ gcc-4.0.0/libstdc++-v3/src/Makefile.am
-@@ -214,6 +214,10 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
---- gcc-4.0.0/libstdc++-v3/src/Makefile.in
-+++ gcc-4.0.0/libstdc++-v3/src/Makefile.in
-@@ -625,7 +625,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -664,7 +664,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
- @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP)
- @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
-@@ -743,6 +743,11 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.0.4/130-missing-execinfo_h.patch b/patches/gcc/4.0.4/130-missing-execinfo_h.patch
deleted file mode 100644
index 0e2092f..0000000
--- a/patches/gcc/4.0.4/130-missing-execinfo_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500
-+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.0.4/140-c99-snprintf.patch b/patches/gcc/4.0.4/140-c99-snprintf.patch
deleted file mode 100644
index dfb22d6..0000000
--- a/patches/gcc/4.0.4/140-c99-snprintf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig 2005-04-29 00:08:41.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h 2005-04-29 00:08:45.000000000 -0500
-@@ -142,7 +142,7 @@
- using ::vsprintf;
- }
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.0.4/150-c99-complex-ugly-hack.patch b/patches/gcc/4.0.4/150-c99-complex-ugly-hack.patch
deleted file mode 100644
index 2ccc80d..0000000
--- a/patches/gcc/4.0.4/150-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/configure-old 2005-04-30 22:04:48.061603912 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 22:06:13.678588152 -0500
-@@ -7194,6 +7194,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.0.4/160-index_macro.patch b/patches/gcc/4.0.4/160-index_macro.patch
deleted file mode 100644
index 1fac112..0000000
--- a/patches/gcc/4.0.4/160-index_macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps 2006-03-24 01:49:51 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/rope 2006-03-24 01:49:37 +0100
-@@ -59,6 +59,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
---- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- namespace __gnu_cxx
- {
- using std::size_t;
diff --git a/patches/gcc/4.0.4/170-libmudflap-susv3-legacy.patch b/patches/gcc/4.0.4/170-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 374b1f8..0000000
--- a/patches/gcc/4.0.4/170-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.2/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834)
-+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy)
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.0.4/180-sdk-libstdc++-includes.patch b/patches/gcc/4.0.4/180-sdk-libstdc++-includes.patch
deleted file mode 100644
index c7676ae..0000000
--- a/patches/gcc/4.0.4/180-sdk-libstdc++-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN gcc-4.0.0-100/libstdc++-v3/fragment.am gcc-4.0.0/libstdc++-v3/fragment.am
---- gcc-4.0.0-100/libstdc++-v3/fragment.am 2004-10-25 15:32:40.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/fragment.am 2005-04-28 21:48:43.000000000 -0500
-@@ -18,5 +18,5 @@
- $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
-
- # -I/-D flags to pass when compiling.
--AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
-
-diff -urN gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am gcc-4.0.0/libstdc++-v3/libmath/Makefile.am
---- gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am 2003-08-27 16:29:42.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/libmath/Makefile.am 2005-04-28 21:48:43.000000000 -0500
-@@ -32,7 +32,7 @@
-
- libmath_la_SOURCES = stubs.c
-
--AM_CPPFLAGS = $(CANADIAN_INCLUDES)
-+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
-
- # Only compiling "C" sources in this directory.
- LIBTOOL = @LIBTOOL@ --tag CC
diff --git a/patches/gcc/4.0.4/190-arm-bigendian.patch b/patches/gcc/4.0.4/190-arm-bigendian.patch
deleted file mode 100644
index fd2c9bf..0000000
--- a/patches/gcc/4.0.4/190-arm-bigendian.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -dur gcc-4.0.4.orig/gcc/config/arm/linux-elf.h gcc-4.0.4/gcc/config/arm/linux-elf.h
---- gcc-4.0.4.orig/gcc/config/arm/linux-elf.h 2007-02-02 19:24:50.000000000 +0100
-+++ gcc-4.0.4/gcc/config/arm/linux-elf.h 2007-02-02 19:26:12.000000000 +0100
-@@ -31,19 +31,33 @@
- /* Do not assume anything about header files. */
- #define NO_IMPLICIT_EXTERN_C
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT ARM_FLAG_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* The GNU C++ standard library requires that these macros be defined. */
- #undef CPLUSPLUS_CPP_SPEC
-@@ -95,7 +109,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #define TARGET_OS_CPP_BUILTINS() \
-Only in gcc-4.0.4/gcc/config/arm: linux-elf.h.orig
-diff -dur gcc-4.0.4.orig/gcc/config.gcc gcc-4.0.4/gcc/config.gcc
---- gcc-4.0.4.orig/gcc/config.gcc 2007-02-02 19:24:50.000000000 +0100
-+++ gcc-4.0.4/gcc/config.gcc 2007-02-02 19:26:12.000000000 +0100
-@@ -672,6 +672,11 @@
- ;;
- 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 arm/aout.h arm/arm.h"
-+ case $target in
-+ arm*b-*)
-+ tm_defines="TARGET_BIG_ENDIAN_DEFAULT=1 $tm_defines"
-+ ;;
-+ esac
- tmake_file="${tmake_file} arm/t-arm arm/t-linux"
- extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- gnu_ld=yes
diff --git a/patches/gcc/4.0.4/200-arm-softfloat.patch b/patches/gcc/4.0.4/200-arm-softfloat.patch
deleted file mode 100644
index 1965a8a..0000000
--- a/patches/gcc/4.0.4/200-arm-softfloat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Enable building a pure soft-float compiler without the need for a software
-floating point library.
-
-diff -dur gcc-4.0.4.orig/gcc/config.gcc gcc-4.0.4/gcc/config.gcc
---- gcc-4.0.4.orig/gcc/config.gcc 2007-02-02 19:12:28.000000000 +0100
-+++ gcc-4.0.4/gcc/config.gcc 2007-02-02 19:12:07.000000000 +0100
-@@ -677,7 +677,7 @@
- tm_defines="TARGET_BIG_ENDIAN_DEFAULT=1 $tm_defines"
- ;;
- esac
-- tmake_file="${tmake_file} arm/t-arm arm/t-linux"
-+ tmake_file="${tmake_file} arm/t-arm arm/t-linux arm/t-arm-elf"
- extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- gnu_ld=yes
- ;;
diff --git a/patches/gcc/4.1.2/100-uclibc-conf.patch b/patches/gcc/4.1.2/100-uclibc-conf.patch
deleted file mode 100644
index 4c3d7d7..0000000
--- a/patches/gcc/4.1.2/100-uclibc-conf.patch
+++ /dev/null
@@ -1,544 +0,0 @@
---- gcc-4.1.2.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/gcc/config/t-linux-uclibc 2007-03-04 23:25:07.000000000 +0100
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
---- gcc-4.1.2.orig/gcc/config.gcc 2006-10-16 01:12:23.000000000 +0200
-+++ gcc-4.1.2/gcc/config.gcc 2007-03-04 23:25:07.000000000 +0100
-@@ -1884,7 +1884,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-@@ -2338,6 +2338,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
---- gcc-4.1.2.orig/boehm-gc/configure 2007-02-14 06:17:22.000000000 +0100
-+++ gcc-4.1.2/boehm-gc/configure 2007-03-04 23:25:07.000000000 +0100
-@@ -4320,6 +4320,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/configure 2006-11-21 18:48:36.000000000 +0100
-+++ gcc-4.1.2/configure 2007-03-04 23:25:07.000000000 +0100
-@@ -1133,7 +1133,7 @@
- ;;
- "")
- case "${target}" in
-- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
- # Enable libmudflap by default in GNU and friends.
- ;;
- *-*-freebsd*)
---- gcc-4.1.2.orig/configure.in 2006-11-21 18:48:36.000000000 +0100
-+++ gcc-4.1.2/configure.in 2007-03-04 23:25:07.000000000 +0100
-@@ -341,7 +341,7 @@
- ;;
- "")
- case "${target}" in
-- *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+ *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
- # Enable libmudflap by default in GNU and friends.
- ;;
- *-*-freebsd*)
---- gcc-4.1.2.orig/contrib/regression/objs-gcc.sh 2005-08-15 02:41:31.000000000 +0200
-+++ gcc-4.1.2/contrib/regression/objs-gcc.sh 2007-03-04 23:25:07.000000000 +0100
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
---- gcc-4.1.2.orig/gcc/config/alpha/linux-elf.h 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.1.2/gcc/config/alpha/linux-elf.h 2007-03-04 23:25:07.000000000 +0100
-@@ -27,7 +27,11 @@
- #define SUBTARGET_EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
-
-+#if defined USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
- #define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
-
- #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
---- gcc-4.1.2.orig/gcc/config/arm/linux-elf.h 2005-10-10 03:04:31.000000000 +0200
-+++ gcc-4.1.2/gcc/config/arm/linux-elf.h 2007-03-04 23:25:07.000000000 +0100
-@@ -51,7 +51,11 @@
-
- #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-
-+#ifdef USE_UCLIBC
-+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
-+#else
- #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2"
-+#endif
-
- #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
- %{b} \
---- gcc-4.1.2.orig/gcc/config/cris/linux.h 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.1.2/gcc/config/cris/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -73,6 +73,25 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
-+#ifdef USE_UCLIBC
-+
-+#undef CRIS_SUBTARGET_VERSION
-+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+
-+#undef CRIS_LINK_SUBTARGET_SPEC
-+#define CRIS_LINK_SUBTARGET_SPEC \
-+ "-mcrislinux\
-+ -rpath-link include/asm/../..%s\
-+ %{shared} %{static}\
-+ %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
-+ %{!shared: \
-+ %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
-+ %{!r:%{O2|O3: --gc-sections}}"
-+
-+#else /* USE_UCLIBC */
-+
- #undef CRIS_SUBTARGET_VERSION
- #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-
-@@ -87,6 +106,8 @@
- %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
- %{!r:%{O2|O3: --gc-sections}}"
-
-+#endif /* USE_UCLIBC */
-+
-
- /* Node: Run-time Target */
-
---- gcc-4.1.2.orig/gcc/config/i386/linux.h 2005-08-10 19:53:01.000000000 +0200
-+++ gcc-4.1.2/gcc/config/i386/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -107,6 +107,11 @@
- #define LINK_EMULATION "elf_i386"
- #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-+#if defined USE_UCLIBC
-+#undef DYNAMIC_LINKER
-+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#endif
-+
- #undef SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
- { "link_emulation", LINK_EMULATION },\
---- gcc-4.1.2.orig/gcc/config/i386/linux64.h 2005-08-10 19:53:01.000000000 +0200
-+++ gcc-4.1.2/gcc/config/i386/linux64.h 2007-03-04 23:25:07.000000000 +0100
-@@ -54,14 +54,21 @@
- When the -shared link option is used a final link is not being
- done. */
-
-+#ifdef USE_UCLIBC
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
-+ %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
-+ %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
- %{static:-static}}"
-
- /* Similar to standard Linux, but adding -ffast-math support. */
---- gcc-4.1.2.orig/gcc/config/ia64/linux.h 2006-12-12 16:24:07.000000000 +0100
-+++ gcc-4.1.2/gcc/config/ia64/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -37,13 +37,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
- #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
---- gcc-4.1.2.orig/gcc/config/m68k/linux.h 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.1.2/gcc/config/m68k/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -123,12 +123,17 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static}}"
-
- /* For compatibility with linux/a.out */
---- gcc-4.1.2.orig/gcc/config/mips/linux.h 2006-12-17 14:57:31.000000000 +0100
-+++ gcc-4.1.2/gcc/config/mips/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -105,6 +105,11 @@
-
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #define LINK_SPEC \
- "%(endian_spec) \
- %{shared:-shared} \
-@@ -112,7 +117,7 @@
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
-
- #undef SUBTARGET_ASM_SPEC
---- gcc-4.1.2.orig/gcc/config/pa/pa-linux.h 2007-01-12 03:23:38.000000000 +0100
-+++ gcc-4.1.2/gcc/config/pa/pa-linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -49,13 +49,18 @@
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "\
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}"
-
- /* glibc's profiling functions don't need gcc to allocate counters. */
---- gcc-4.1.2.orig/gcc/config/rs6000/linux.h 2006-02-10 21:58:33.000000000 +0100
-+++ gcc-4.1.2/gcc/config/rs6000/linux.h 2007-03-04 23:25:07.000000000 +0100
-@@ -72,7 +72,11 @@
- #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
-
- #undef LINK_OS_DEFAULT_SPEC
-+#ifdef USE_UCLIBC
-+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
-+#else
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-+#endif
-
- #define LINK_GCC_C_SEQUENCE_SPEC \
- "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
---- gcc-4.1.2.orig/gcc/config/rs6000/sysv4.h 2006-02-10 21:58:33.000000000 +0100
-+++ gcc-4.1.2/gcc/config/rs6000/sysv4.h 2007-03-04 23:25:08.000000000 +0100
-@@ -866,6 +866,7 @@
- mcall-linux : %(link_os_linux) ; \
- mcall-gnu : %(link_os_gnu) ; \
- mcall-netbsd : %(link_os_netbsd) ; \
-+ mcall-linux-uclibc : %(link_os_linux_uclibc); \
- mcall-openbsd: %(link_os_openbsd) ; \
- : %(link_os_default) }"
-
-@@ -1043,6 +1044,10 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-
-+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
-+
- #if defined(HAVE_LD_EH_FRAME_HDR)
- # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
- #endif
-@@ -1209,6 +1214,7 @@
- { "link_os_sim", LINK_OS_SIM_SPEC }, \
- { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
- { "link_os_linux", LINK_OS_LINUX_SPEC }, \
-+ { "link_os_linux_uclibc", LINK_OS_LINUX_UCLIBC_SPEC }, \
- { "link_os_gnu", LINK_OS_GNU_SPEC }, \
- { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
---- gcc-4.1.2.orig/gcc/config/s390/linux.h 2006-12-12 16:24:07.000000000 +0100
-+++ gcc-4.1.2/gcc/config/s390/linux.h 2007-03-04 23:25:08.000000000 +0100
-@@ -77,6 +77,13 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
-
-+#ifdef USE_UCLIBC
-+#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
-+#else
-+#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC \
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-@@ -86,8 +93,8 @@
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker: \
-- %{m31:-dynamic-linker /lib/ld.so.1} \
-- %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
-+ %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
-+ %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
-
- #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-
---- gcc-4.1.2.orig/gcc/config/sh/linux.h 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.1.2/gcc/config/sh/linux.h 2007-03-04 23:25:08.000000000 +0100
-@@ -56,12 +56,21 @@
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
- #undef SUBTARGET_LINK_SPEC
-+#ifdef USE_UCLIBC
-+#define SUBTARGET_LINK_SPEC \
-+ "%{shared:-shared} \
-+ %{!static: \
-+ %{rdynamic:-export-dynamic} \
-+ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
-+ %{static:-static}"
-+#else
- #define SUBTARGET_LINK_SPEC \
- "%{shared:-shared} \
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
- %{static:-static}"
-+#endif
-
- /* Output assembler code to STREAM to call the profiler. */
-
---- gcc-4.1.2.orig/gcc/config/sparc/linux.h 2006-02-11 09:38:51.000000000 +0100
-+++ gcc-4.1.2/gcc/config/sparc/linux.h 2007-03-04 23:25:08.000000000 +0100
-@@ -125,6 +125,11 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #undef LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
-@@ -132,7 +137,7 @@
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}}"
-
- /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
---- gcc-4.1.2.orig/gcc/config/sparc/linux64.h 2006-02-11 09:38:51.000000000 +0100
-+++ gcc-4.1.2/gcc/config/sparc/linux64.h 2007-03-04 23:25:08.000000000 +0100
-@@ -162,12 +162,17 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
-+#ifdef USE_UCLIBC
-+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#else
-+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#endif
- #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
-+ %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
- %{static:-static}}} \
- "
-
---- gcc-4.1.2.orig/libffi/configure 2007-02-14 06:17:22.000000000 +0100
-+++ gcc-4.1.2/libffi/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -3457,6 +3457,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/libgfortran/configure 2006-12-06 11:55:37.000000000 +0100
-+++ gcc-4.1.2/libgfortran/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -3699,6 +3699,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/libjava/configure 2007-02-14 06:17:22.000000000 +0100
-+++ gcc-4.1.2/libjava/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -5137,6 +5137,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/libmudflap/configure 2005-10-05 01:54:38.000000000 +0200
-+++ gcc-4.1.2/libmudflap/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -5382,6 +5382,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/libobjc/configure 2007-02-14 06:17:22.000000000 +0100
-+++ gcc-4.1.2/libobjc/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -3312,6 +3312,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- gcc-4.1.2.orig/libtool.m4 2005-07-16 04:30:53.000000000 +0200
-+++ gcc-4.1.2/libtool.m4 2007-03-04 23:25:08.000000000 +0100
-@@ -743,6 +743,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
---- gcc-4.1.2.orig/ltconfig 2006-07-04 22:30:34.000000000 +0200
-+++ gcc-4.1.2/ltconfig 2007-03-04 23:25:08.000000000 +0100
-@@ -603,6 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
-+linux-uclibc*) ;;
- linux-gnu*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-@@ -1274,6 +1275,23 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # 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
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- need_lib_prefix=no
- need_version=no
---- gcc-4.1.2.orig/zlib/configure 2005-09-12 19:02:07.000000000 +0200
-+++ gcc-4.1.2/zlib/configure 2007-03-04 23:25:08.000000000 +0100
-@@ -3426,6 +3426,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff --git a/patches/gcc/4.1.2/110-arm-eabi.patch b/patches/gcc/4.1.2/110-arm-eabi.patch
deleted file mode 100644
index 6a7a36d..0000000
--- a/patches/gcc/4.1.2/110-arm-eabi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gcc-4.1.2.orig/gcc/config.gcc 2007-03-04 23:25:37.000000000 +0100
-+++ gcc-4.1.2/gcc/config.gcc 2007-03-04 23:25:45.000000000 +0100
-@@ -674,7 +674,7 @@
- tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-- arm*-*-linux-gnueabi)
-+ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
- 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"
- # The BPABI long long divmod functions return a 128-bit value in
---- gcc-4.1.2.orig/gcc/config/arm/linux-eabi.h 2005-11-15 15:32:13.000000000 +0100
-+++ gcc-4.1.2/gcc/config/arm/linux-eabi.h 2007-03-04 23:25:45.000000000 +0100
-@@ -53,7 +53,11 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
- GNU/Linux binaries on an EABI system. */
- #undef LINUX_TARGET_INTERPRETER
-+#ifdef USE_UCLIBC
-+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
-+#else
- #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3"
-+#endif
-
- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
- use the GNU/Linux version, not the generic BPABI version. */
diff --git a/patches/gcc/4.1.2/120-uclibc-locale.patch b/patches/gcc/4.1.2/120-uclibc-locale.patch
deleted file mode 100644
index 8c5a183..0000000
--- a/patches/gcc/4.1.2/120-uclibc-locale.patch
+++ /dev/null
@@ -1,3239 +0,0 @@
---- gcc-4.1.2.orig/libstdc++-v3/acinclude.m4 2007-01-29 11:51:01.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/acinclude.m4 2007-03-04 23:31:57.000000000 +0100
-@@ -1003,7 +1003,7 @@
- AC_MSG_CHECKING([for C locale to use])
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # If they didn't use this option switch, or if they specified --enable
- # with no specific model, we'll have to look for one. If they
-@@ -1019,6 +1019,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1162,6 +1165,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,152 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (__cloc && _S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out,
-+ const int __size __attribute__ ((__unused__)),
-+ const char* __fmt,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,314 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // The case of __m == ctype_base::space is particularly important,
-+ // due to its use in many istream functions. Therefore we deal with
-+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+ // is the mask corresponding to ctype_base::space. NB: an encoding
-+ // change would not affect correctness!
-+ bool __ret = false;
-+ if (__m == _M_bit[5])
-+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+ else
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur])
-+ {
-+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ else if (__m == _M_bit[__bitcur])
-+ break;
-+ }
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,121 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
-+ {
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
-+ _M_name_messages = __tmp;
-+
-+ // Last to avoid leaking memory if new throws.
-+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ __ret = pattern();
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,173 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
---- gcc-4.1.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/locale/uclibc/time_members.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,76 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING. If not, write to the Free
-+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(NULL)
-+ {
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
-+ _M_name_timepunct = __tmp;
-+
-+ try
-+ { _M_initialize_timepunct(__cloc); }
-+ catch(...)
-+ {
-+ delete [] _M_name_timepunct;
-+ __throw_exception_again;
-+ }
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
---- gcc-4.1.2.orig/libstdc++-v3/config/os/uclibc/ctype_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/os/uclibc/ctype_base.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,64 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+/** @file ctype_base.h
-+ * This is an internal header file, included by other library headers.
-+ * You should not attempt to use it directly.
-+ */
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ /// @brief Base class for ctype.
-+ struct ctype_base
-+ {
-+ // Note: In uClibc, the following two types depend on configuration.
-+
-+ // Non-standard typedefs.
-+ typedef const __ctype_touplow_t* __to_type;
-+
-+ // NB: Offsets into ctype<char>::_M_table force a particular size
-+ // on the mask type. Because of this, we don't use an enum.
-+ typedef __ctype_mask_t mask;
-+ static const mask upper = _ISupper;
-+ static const mask lower = _ISlower;
-+ static const mask alpha = _ISalpha;
-+ static const mask digit = _ISdigit;
-+ static const mask xdigit = _ISxdigit;
-+ static const mask space = _ISspace;
-+ static const mask print = _ISprint;
-+ static const mask graph = _ISalpha | _ISdigit | _ISpunct;
-+ static const mask cntrl = _IScntrl;
-+ static const mask punct = _ISpunct;
-+ static const mask alnum = _ISalpha | _ISdigit;
-+ };
---- gcc-4.1.2.orig/libstdc++-v3/config/os/uclibc/ctype_inline.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/os/uclibc/ctype_inline.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,69 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-+// functions go in ctype.cc
-+
-+ bool
-+ ctype<char>::
-+ is(mask __m, char __c) const
-+ { return _M_table[static_cast<unsigned char>(__c)] & __m; }
-+
-+ const char*
-+ ctype<char>::
-+ is(const char* __low, const char* __high, mask* __vec) const
-+ {
-+ while (__low < __high)
-+ *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
-+ return __high;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_is(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
-+ ++__low;
-+ return __low;
-+ }
-+
-+ const char*
-+ ctype<char>::
-+ scan_not(mask __m, const char* __low, const char* __high) const
-+ {
-+ while (__low < __high
-+ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
-+ ++__low;
-+ return __low;
-+ }
---- gcc-4.1.2.orig/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,92 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.1 Locales
-+//
-+
-+// Information as gleaned from /usr/include/ctype.h
-+
-+ const ctype_base::mask*
-+ ctype<char>::classic_table() throw()
-+ { return __C_ctype_b; }
-+
-+ ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
-+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
-+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
-+ {
-+ _M_toupper = __C_ctype_toupper;
-+ _M_tolower = __C_ctype_tolower;
-+ _M_table = __table ? __table : __C_ctype_b;
-+ memset(_M_widen, 0, sizeof(_M_widen));
-+ memset(_M_narrow, 0, sizeof(_M_narrow));
-+ }
-+
-+ char
-+ ctype<char>::do_toupper(char __c) const
-+ { return _M_toupper[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_toupper(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_toupper[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
-+
-+ char
-+ ctype<char>::do_tolower(char __c) const
-+ { return _M_tolower[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<char>::do_tolower(char* __low, const char* __high) const
-+ {
-+ while (__low < __high)
-+ {
-+ *__low = _M_tolower[static_cast<unsigned char>(*__low)];
-+ ++__low;
-+ }
-+ return __high;
-+ }
---- gcc-4.1.2.orig/libstdc++-v3/config/os/uclibc/os_defines.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/config/os/uclibc/os_defines.h 2007-03-04 23:31:57.000000000 +0100
-@@ -0,0 +1,44 @@
-+// Specific definitions for GNU/Linux -*- C++ -*-
-+
-+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+#ifndef _GLIBCXX_OS_DEFINES
-+#define _GLIBCXX_OS_DEFINES 1
-+
-+// System-specific #define, typedefs, corrections, etc, go here. This
-+// file will come before all others.
-+
-+// This keeps isanum, et al from being propagated as macros.
-+#define __NO_CTYPE 1
-+
-+#include <features.h>
-+
-+// We must not see the optimized string functions GNU libc defines.
-+#define __NO_STRING_INLINES
-+
-+#endif
---- gcc-4.1.2.orig/libstdc++-v3/configure 2007-01-29 11:51:01.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/configure 2007-03-04 23:31:57.000000000 +0100
-@@ -4005,6 +4005,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -5740,7 +5745,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5765,6 +5770,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -5995,6 +6003,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
---- gcc-4.1.2.orig/libstdc++-v3/configure.host 2007-01-28 21:12:40.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/configure.host 2007-03-04 23:31:57.000000000 +0100
-@@ -270,6 +270,12 @@
- ;;
- esac
-
-+# Override for uClibc since linux-uclibc gets mishandled above.
-+case "${host_os}" in
-+ *-uclibc*)
-+ os_include_dir="os/uclibc"
-+ ;;
-+esac
-
- # Set any OS-dependent and CPU-dependent bits.
- # THIS TABLE IS SORTED. KEEP IT THAT WAY.
---- gcc-4.1.2.orig/libstdc++-v3/crossconfig.m4 2006-12-12 15:18:36.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/crossconfig.m4 2007-03-04 23:31:57.000000000 +0100
-@@ -143,6 +143,99 @@
- ;;
- esac
- ;;
-+ *-uclibc*)
-+# Temporary hack until we implement the float versions of the libm funcs
-+ AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-+ machine/endian.h machine/param.h sys/machine.h sys/types.h \
-+ fp.h float.h endian.h inttypes.h locale.h float.h stdint.h])
-+ SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+ AC_SUBST(SECTION_FLAGS)
-+ GLIBCXX_CHECK_LINKER_FEATURES
-+ GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-+ GLIBCXX_CHECK_WCHAR_T_SUPPORT
-+
-+ # For LFS.
-+ AC_DEFINE(HAVE_INT64_T)
-+ case "$target" in
-+ *-uclinux*)
-+ # Don't enable LFS with uClinux
-+ ;;
-+ *)
-+ AC_DEFINE(_GLIBCXX_USE_LFS)
-+ esac
-+
-+ # For showmanyc_helper().
-+ AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
-+ GLIBCXX_CHECK_POLL
-+ GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
-+
-+ # For xsputn_2().
-+ AC_CHECK_HEADERS(sys/uio.h)
-+ GLIBCXX_CHECK_WRITEV
-+
-+# AC_DEFINE(HAVE_ACOSF)
-+# AC_DEFINE(HAVE_ASINF)
-+# AC_DEFINE(HAVE_ATANF)
-+# AC_DEFINE(HAVE_ATAN2F)
-+ AC_DEFINE(HAVE_CEILF)
-+ AC_DEFINE(HAVE_COPYSIGN)
-+# AC_DEFINE(HAVE_COPYSIGNF)
-+# AC_DEFINE(HAVE_COSF)
-+# AC_DEFINE(HAVE_COSHF)
-+# AC_DEFINE(HAVE_EXPF)
-+# AC_DEFINE(HAVE_FABSF)
-+ AC_DEFINE(HAVE_FINITE)
-+ AC_DEFINE(HAVE_FINITEF)
-+ AC_DEFINE(HAVE_FLOORF)
-+# AC_DEFINE(HAVE_FMODF)
-+# AC_DEFINE(HAVE_FREXPF)
-+ AC_DEFINE(HAVE_HYPOT)
-+# AC_DEFINE(HAVE_HYPOTF)
-+ AC_DEFINE(HAVE_ISINF)
-+ AC_DEFINE(HAVE_ISINFF)
-+ AC_DEFINE(HAVE_ISNAN)
-+ AC_DEFINE(HAVE_ISNANF)
-+# AC_DEFINE(HAVE_LOGF)
-+# AC_DEFINE(HAVE_LOG10F)
-+# AC_DEFINE(HAVE_MODFF)
-+# AC_DEFINE(HAVE_SINF)
-+# AC_DEFINE(HAVE_SINHF)
-+# AC_DEFINE(HAVE_SINCOS)
-+# AC_DEFINE(HAVE_SINCOSF)
-+ AC_DEFINE(HAVE_SQRTF)
-+# AC_DEFINE(HAVE_TANF)
-+# AC_DEFINE(HAVE_TANHF)
-+ if test x"long_double_math_on_this_cpu" = x"yes"; then
-+ AC_MSG_ERROR([long_double_math_on_this_cpu is yes!])
-+# AC_DEFINE(HAVE_ACOSL)
-+# AC_DEFINE(HAVE_ASINL)
-+# AC_DEFINE(HAVE_ATANL)
-+# AC_DEFINE(HAVE_ATAN2L)
-+# AC_DEFINE(HAVE_CEILL)
-+# AC_DEFINE(HAVE_COPYSIGNL)
-+# AC_DEFINE(HAVE_COSL)
-+# AC_DEFINE(HAVE_COSHL)
-+# AC_DEFINE(HAVE_EXPL)
-+# AC_DEFINE(HAVE_FABSL)
-+# AC_DEFINE(HAVE_FINITEL)
-+# AC_DEFINE(HAVE_FLOORL)
-+# AC_DEFINE(HAVE_FMODL)
-+# AC_DEFINE(HAVE_FREXPL)
-+# AC_DEFINE(HAVE_HYPOTL)
-+# AC_DEFINE(HAVE_ISINFL)
-+# AC_DEFINE(HAVE_ISNANL)
-+# AC_DEFINE(HAVE_LOGL)
-+# AC_DEFINE(HAVE_LOG10L)
-+# AC_DEFINE(HAVE_MODFL)
-+# AC_DEFINE(HAVE_POWL)
-+# AC_DEFINE(HAVE_SINL)
-+# AC_DEFINE(HAVE_SINHL)
-+# AC_DEFINE(HAVE_SINCOSL)
-+# AC_DEFINE(HAVE_SQRTL)
-+# AC_DEFINE(HAVE_TANL)
-+# AC_DEFINE(HAVE_TANHL)
-+ fi
-+ ;;
- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
- AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
- machine/endian.h machine/param.h sys/machine.h sys/types.h \
-@@ -157,7 +250,7 @@
- AC_DEFINE(HAVE_INT64_T)
- case "$target" in
- *-uclinux*)
-- # Don't enable LFS with uClibc
-+ # Don't enable LFS with uClinux
- ;;
- *)
- AC_DEFINE(_GLIBCXX_USE_LFS)
---- gcc-4.1.2.orig/libstdc++-v3/include/c_compatibility/wchar.h 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.1.2/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 23:31:57.000000000 +0100
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
---- gcc-4.1.2.orig/libstdc++-v3/include/c_std/std_cwchar.h 2005-10-30 23:21:50.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/include/c_std/std_cwchar.h 2007-03-04 23:31:57.000000000 +0100
-@@ -180,7 +180,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.1.2/130-libstdc++-pic.patch b/patches/gcc/4.1.2/130-libstdc++-pic.patch
deleted file mode 100644
index 82be8a6..0000000
--- a/patches/gcc/4.1.2/130-libstdc++-pic.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gcc-4.1.2.orig/libstdc++-v3/src/Makefile.am 2006-01-10 05:01:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/src/Makefile.am 2007-03-04 23:32:40.000000000 +0100
-@@ -234,6 +234,12 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
---- gcc-4.1.2.orig/libstdc++-v3/src/Makefile.in 2006-01-10 18:14:00.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/src/Makefile.in 2007-03-04 23:32:40.000000000 +0100
-@@ -627,7 +627,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -660,6 +660,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -760,6 +761,13 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.1.2/140-missing-execinfo_h.patch b/patches/gcc/4.1.2/140-missing-execinfo_h.patch
deleted file mode 100644
index a1bfddb..0000000
--- a/patches/gcc/4.1.2/140-missing-execinfo_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.1.2.orig/boehm-gc/include/gc.h 2005-01-02 04:35:57.000000000 +0100
-+++ gcc-4.1.2/boehm-gc/include/gc.h 2007-03-04 23:33:07.000000000 +0100
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.1.2/150-c99-snprintf.patch b/patches/gcc/4.1.2/150-c99-snprintf.patch
deleted file mode 100644
index 775cd18..0000000
--- a/patches/gcc/4.1.2/150-c99-snprintf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.1.2.orig/libstdc++-v3/include/c_std/std_cstdio.h 2005-10-30 23:21:50.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/include/c_std/std_cstdio.h 2007-03-04 23:33:27.000000000 +0100
-@@ -143,7 +143,7 @@
- using ::vsprintf;
- }
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.1.2/160-c99-complex-ugly-hack.patch b/patches/gcc/4.1.2/160-c99-complex-ugly-hack.patch
deleted file mode 100644
index 209c457..0000000
--- a/patches/gcc/4.1.2/160-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.1.2.orig/libstdc++-v3/configure 2007-03-04 23:32:31.000000000 +0100
-+++ gcc-4.1.2/libstdc++-v3/configure 2007-03-04 23:33:54.000000000 +0100
-@@ -7324,6 +7324,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.1.2/170-index_macro.patch b/patches/gcc/4.1.2/170-index_macro.patch
deleted file mode 100644
index a990b07..0000000
--- a/patches/gcc/4.1.2/170-index_macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gcc-4.1.2.orig/libstdc++-v3/include/ext/rope 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.1.2/libstdc++-v3/include/ext/rope 2007-03-04 23:34:08.000000000 +0100
-@@ -57,6 +57,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
---- gcc-4.1.2.orig/libstdc++-v3/include/ext/ropeimpl.h 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.1.2/libstdc++-v3/include/ext/ropeimpl.h 2007-03-04 23:34:08.000000000 +0100
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- namespace __gnu_cxx
- {
- using std::size_t;
diff --git a/patches/gcc/4.1.2/180-libbackend_dep_gcov-iov.h.patch b/patches/gcc/4.1.2/180-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 714449b..0000000
--- a/patches/gcc/4.1.2/180-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.1.2.orig/gcc/Makefile.in 2006-11-01 15:40:44.000000000 +0100
-+++ gcc-4.1.2/gcc/Makefile.in 2007-03-04 23:34:32.000000000 +0100
-@@ -2522,7 +2522,7 @@
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
- insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DTARGET_NAME=\"$(target_noncanonical)\" \
- -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc/4.1.2/190-sh-pr24836.patch b/patches/gcc/4.1.2/190-sh-pr24836.patch
deleted file mode 100644
index 39328a5..0000000
--- a/patches/gcc/4.1.2/190-sh-pr24836.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gcc-4.1.2.orig/gcc/configure.ac 2006-11-13 23:09:55.000000000 +0100
-+++ gcc-4.1.2/gcc/configure.ac 2007-03-04 23:34:53.000000000 +0100
-@@ -2435,7 +2435,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
---- gcc-4.1.2.orig/gcc/configure 2006-11-13 23:09:55.000000000 +0100
-+++ gcc-4.1.2/gcc/configure 2007-03-04 23:34:53.000000000 +0100
-@@ -14762,7 +14762,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.1.2/200-arm-bigendian.patch b/patches/gcc/4.1.2/200-arm-bigendian.patch
deleted file mode 100644
index 57b83eb..0000000
--- a/patches/gcc/4.1.2/200-arm-bigendian.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- gcc-4.1.2.orig/gcc/config/arm/linux-elf.h 2007-03-04 23:25:37.000000000 +0100
-+++ gcc-4.1.2/gcc/config/arm/linux-elf.h 2007-03-04 23:35:09.000000000 +0100
-@@ -28,19 +28,33 @@
- #undef TARGET_VERSION
- #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-@@ -65,7 +79,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " LINUX_TARGET_INTERPRETER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #undef LINK_SPEC
---- gcc-4.1.2.orig/gcc/config.gcc 2007-03-04 23:31:48.000000000 +0100
-+++ gcc-4.1.2/gcc/config.gcc 2007-03-04 23:35:09.000000000 +0100
-@@ -672,6 +672,11 @@
- ;;
- 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-gnueabi | arm*-*-linux-uclibcgnueabi)
---- gcc-4.1.2.orig/gcc/config/arm/linux-eabi.h 2007-03-04 23:31:48.000000000 +0100
-+++ gcc-4.1.2/gcc/config/arm/linux-eabi.h 2007-03-04 23:35:09.000000000 +0100
-@@ -20,6 +20,17 @@
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#undef TARGET_LINKER_EMULATION
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_LINKER_EMULATION "armelfb_linux_eabi"
-+#else
-+#define TARGET_LINKER_EMULATION "armelf_linux_eabi"
-+#endif
-+
- /* On EABI GNU/Linux, we want both the BPABI builtins and the
- GNU/Linux builtins. */
- #undef TARGET_OS_CPP_BUILTINS
-@@ -48,7 +59,7 @@
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-
- #undef SUBTARGET_EXTRA_LINK_SPEC
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
-
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
- GNU/Linux binaries on an EABI system. */
---- gcc-4.1.2.orig/gcc/config/arm/bpabi.h 2005-12-13 02:35:37.000000000 +0100
-+++ gcc-4.1.2/gcc/config/arm/bpabi.h 2007-03-04 23:35:09.000000000 +0100
-@@ -33,9 +33,19 @@
- #undef FPUTYPE_DEFAULT
- #define FPUTYPE_DEFAULT FPUTYPE_VFP
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#endif
-+
- /* EABI targets should enable interworking by default. */
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT MASK_INTERWORK
-+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
-
- /* The ARM BPABI functions return a boolean; they use no special
- calling convention. */
diff --git a/patches/gcc/4.1.2/210-softfloat-fix.patch b/patches/gcc/4.1.2/210-softfloat-fix.patch
deleted file mode 100644
index 844c9a0..0000000
--- a/patches/gcc/4.1.2/210-softfloat-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch (C) 2007 Yann E. MORIN
-Licensed under GPL v2.
-
-First hunk of this patch solves compiling uClibc-0.9.28{,.1} :
-
-make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
- LD libuClibc-0.9.29.so
-libc/libc_so.a(difftime.os): In function `difftime':
-difftime.c:(.text+0x8): undefined reference to `__floatsidf'
-difftime.c:(.text+0x2c): undefined reference to `__subdf3'
-libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
-_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
-_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
-_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
-_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
-_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
-_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
-_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
-libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
-__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
-libc/libc_so.a(strtof.os): In function `strtof':
-strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
-/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
-In function `__fixunsdfsi':
-libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
-make[2]: *** [lib/libc.so] Error 1
-make[1]: *** [lib/libc.so.0] Error 2
-make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
-make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
-Error 2
-
-The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
-
-
-diff -dur gcc-4.1.1.no-softfloat-fix/gcc/config.gcc gcc-4.1.1/gcc/config.gcc
---- gcc-4.1.1.no-softfloat-fix/gcc/config.gcc 2007-02-01 21:57:17.000000000 +0100
-+++ gcc-4.1.1/gcc/config.gcc 2007-02-01 22:11:06.000000000 +0100
-@@ -690,7 +690,7 @@
- default_use_cxa_atexit=yes
- ;;
- *)
-- tmake_file="$tmake_file arm/t-linux"
-+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
- ;;
- esac
- tm_file="$tm_file arm/aout.h arm/arm.h"
-diff -dur gcc-4.1.1.-lfloat/gcc/config/arm/linux-elf.h gcc-4.1.1/gcc/config/arm/linux-elf.h
---- gcc-4.1.1.-lfloat/gcc/config/arm/linux-elf.h 2007-02-01 21:57:17.000000000 +0100
-+++ gcc-4.1.1/gcc/config/arm/linux-elf.h 2007-02-01 23:00:42.000000000 +0100
-@@ -63,7 +63,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #ifdef USE_UCLIBC
- #define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
diff --git a/patches/gcc/4.2.0/100-uclibc-conf.patch b/patches/gcc/4.2.0/100-uclibc-conf.patch
deleted file mode 100644
index 4243ff7..0000000
--- a/patches/gcc/4.2.0/100-uclibc-conf.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- gcc/libgomp/configure
-+++ gcc/libgomp/configure
-@@ -3771,7 +3771,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/gcc/config/cris/linux.h
-+++ gcc/gcc/config/cris/linux.h
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -4276,7 +4276,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/zlib/configure
-+++ gcc/zlib/configure
-@@ -3422,7 +3422,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libobjc/configure
-+++ gcc/libobjc/configure
-@@ -3309,7 +3309,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libgfortran/configure
-+++ gcc/libgfortran/configure
-@@ -3695,7 +3695,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libmudflap/configure
-+++ gcc/libmudflap/configure
-@@ -5378,7 +5378,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/boehm-gc/configure
-+++ gcc/boehm-gc/configure
-@@ -4316,7 +4316,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libffi/configure
-+++ gcc/libffi/configure
-@@ -3453,7 +3453,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libssp/configure
-+++ gcc/libssp/configure
-@@ -4409,7 +4409,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
---- gcc/libjava/classpath/configure
-+++ gcc/libjava/classpath/configure
-@@ -4665,7 +4665,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libjava/configure
-+++ gcc/libjava/configure
-@@ -5212,7 +5212,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libtool.m4
-+++ gcc/libtool.m4
-@@ -739,7 +739,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/ltconfig
-+++ gcc/ltconfig
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.2.0/110-uclibc-conf-noupstream.patch b/patches/gcc/4.2.0/110-uclibc-conf-noupstream.patch
deleted file mode 100644
index 09c9bbe..0000000
--- a/patches/gcc/4.2.0/110-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/gcc/config.gcc.uclibc100-sh~ 2006-03-06 20:46:56 +0100
-+++ gcc/gcc/config.gcc 2006-03-10 15:02:41 +0100
-@@ -1905,7 +1905,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.2.0/120-uclibc-locale.patch b/patches/gcc/4.2.0/120-uclibc-locale.patch
deleted file mode 100644
index c933d1c..0000000
--- a/patches/gcc/4.2.0/120-uclibc-locale.patch
+++ /dev/null
@@ -1,2790 +0,0 @@
---- gcc/libstdc++-v3/acinclude.m4
-+++ gcc/libstdc++-v3/acinclude.m4
-@@ -1369,7 +1369,7 @@
- AC_MSG_CHECKING([for C locale to use])
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # If they didn't use this option switch, or if they specified --enable
- # with no specific model, we'll have to look for one. If they
-@@ -1385,6 +1385,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1528,6 +1531,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out,
-+ const int __size __attribute__ ((__unused__)),
-+ const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
---- gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ ;
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -5764,7 +5764,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5789,6 +5789,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6019,6 +6022,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/include/c_compatibility/wchar.h
-+++ gcc/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
---- gcc/libstdc++-v3/include/c_std/std_cwchar.h
-+++ gcc/libstdc++-v3/include/c_std/std_cwchar.h
-@@ -182,7 +182,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.2.0/130-uclibc-locale-no__x.patch b/patches/gcc/4.2.0/130-uclibc-locale-no__x.patch
deleted file mode 100644
index 6ba4700..0000000
--- a/patches/gcc/4.2.0/130-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,213 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif
-
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l iswctype_l
-+# define __towlower_l towlower_l
-+# define __towupper_l towupper_l
-+# define __wcscoll_l wcscoll_l
-+# define __wcsftime_l wcsftime_l
-+# define __wcsxfrm_l wcsxfrm_l
-+# define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L) nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+# define __strtod_l(S, E, L) strtod((S), (E))
-+# define __strtof_l(S, E, L) strtof((S), (E))
-+# define __strtold_l(S, E, L) strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c) NULL
-+# define __freelocale(a) ((void)0)
-+# define __duplocale(a) __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l(C, M, L) iswctype((C), (M))
-+# define __towlower_l(C, L) towlower((C))
-+# define __towupper_l(C, L) towupper((C))
-+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
-+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+# define __wctype_l(S, L) wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
--#define __strtof_l(S, E, L) strtof((S), (E))
--#define __strtod_l(S, E, L) strtod((S), (E))
--#define __strtold_l(S, E, L) strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c) NULL
--#define __freelocale(a) ((void)0)
--#define __duplocale(a) __c_locale()
--#endif
--
- namespace std
- {
- template<>
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
- // These are basically extensions to char_traits, and perhaps should
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
--
- namespace std
- {
- // Construct and return valid pattern consisting of some combination of:
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L) wctype((S))
--#define __towupper_l(C, L) towupper((C))
--#define __towlower_l(C, L) towlower((C))
--#define __iswctype_l(C, M, L) iswctype((C), (M))
--#endif
--
- namespace std
- {
- // NB: The other ctype<char> specializations are in src/locale.cc and
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 2006-03-10 15:32:37 +0100
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
-- const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
-
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:32:37 +0100
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
-- const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D) ((void)0)
--#define __bindtextdomain(D,P) ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D) ((void)0)
-+#define bindtextdomain(D,P) ((void)0)
- #endif
-
- // Non-virtual member functions.
-@@ -70,7 +66,7 @@
- messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
- const char* __dir) const
- {
-- __bindtextdomain(__s.c_str(), __dir);
-+ bindtextdomain(__s.c_str(), __dir);
- return this->do_open(__s, __loc);
- }
-
-@@ -90,7 +86,7 @@
- {
- // No error checking is done, assume the catalog exists and can
- // be used.
-- __textdomain(__s.c_str());
-+ textdomain(__s.c_str());
- return 0;
- }
-
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-03-10 15:32:37 +0100
-@@ -68,6 +68,7 @@
- {
- extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
-
- namespace std
diff --git a/patches/gcc/4.2.0/140-uclibc-locale-wchar_fix.patch b/patches/gcc/4.2.0/140-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 160ab35..0000000
--- a/patches/gcc/4.2.0/140-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100
-@@ -127,12 +127,25 @@
- {
- // Named locale.
- // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- union { char *__s; wchar_t __w; } __u;
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- _M_data->_M_decimal_point = __u.__w;
-
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- _M_data->_M_thousands_sep = __u.__w;
-+#endif
-
- if (_M_data->_M_thousands_sep == L'\0')
- _M_data->_M_grouping = "";
diff --git a/patches/gcc/4.2.0/150-uclibc-locale-update.patch b/patches/gcc/4.2.0/150-uclibc-locale-update.patch
deleted file mode 100644
index 86b2844..0000000
--- a/patches/gcc/4.2.0/150-uclibc-locale-update.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:39:14 +0100
-@@ -46,16 +47,13 @@
- __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- float __f = __strtof_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __f;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -63,16 +61,13 @@
- __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- double __d = __strtod_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __d;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -80,16 +75,13 @@
- __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- long double __ld = __strtold_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __ld;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- void
-@@ -110,7 +102,7 @@
- void
- locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
- {
-- if (_S_get_c_locale() != __cloc)
-+ if (__cloc && _S_get_c_locale() != __cloc)
- __freelocale(__cloc);
- }
-
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- namespace std
-@@ -138,20 +143,34 @@
- ctype<wchar_t>::
- do_is(mask __m, wchar_t __c) const
- {
-- // Highest bitmask in ctype_base == 10, but extra in "C"
-- // library for blank.
-+ // The case of __m == ctype_base::space is particularly important,
-+ // due to its use in many istream functions. Therefore we deal with
-+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+ // is the mask corresponding to ctype_base::space. NB: an encoding
-+ // change would not affect correctness!
- bool __ret = false;
-- const size_t __bitmasksize = 11;
-- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-- if (__m & _M_bit[__bitcur]
-- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-- {
-- __ret = true;
-- break;
-- }
-+ if (__m == _M_bit[5])
-+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+ else
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur])
-+ {
-+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ else if (__m == _M_bit[__bitcur])
-+ break;
-+ }
-+ }
- return __ret;
- }
--
-+
- const wchar_t*
- ctype<wchar_t>::
- do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:39:14 +0100
-@@ -47,18 +47,21 @@
- template<typename _CharT>
- messages<_CharT>::messages(size_t __refs)
- : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-- _M_name_messages(_S_get_c_name())
-+ _M_name_messages(_S_get_c_name())
- { }
-
- template<typename _CharT>
- messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- size_t __refs)
-- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-- _M_name_messages(__s)
-+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_messages = __tmp;
-+
-+ // Last to avoid leaking memory if new throws.
-+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
- }
-
- template<typename _CharT>
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- }
- break;
- default:
-- ;
-+ __ret = pattern();
- }
- return __ret;
- }
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h.uclibc200_update~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h 2006-03-10 15:39:14 +0100
-@@ -37,25 +37,33 @@
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
- : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(__s)
-+ _M_name_timepunct(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_timepunct = __tmp;
-- _M_initialize_timepunct(__cloc);
-+
-+ try
-+ { _M_initialize_timepunct(__cloc); }
-+ catch(...)
-+ {
-+ delete [] _M_name_timepunct;
-+ __throw_exception_again;
-+ }
- }
-
- template<typename _CharT>
---- gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h.old 2006-09-28 11:39:00.000000000 +0200
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-09-28 12:10:41.000000000 +0200
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
-
- #include <cstring> // get std::strlen
--#include <cstdio> // get std::snprintf or std::sprintf
-+#include <cstdio> // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h> // For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h> // For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> // For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h> // For messages
- #endif
-+#include <cstdarg>
-
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
-
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
--
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
- typedef int* __c_locale;
- #endif
-
-- // Convert numeric value of type _Tv to string and return length of
-- // string. If snprintf is available use it, otherwise fall back to
-- // the unsafe sprintf which, in general, can be dangerous and should
-+ // Convert numeric value of type double to string and return length of
-+ // string. If vsnprintf is available use it, otherwise fall back to
-+ // the unsafe vsprintf which, in general, can be dangerous and should
- // be avoided.
-- template<typename _Tv>
-- int
-- __convert_from_v(char* __out,
-- const int __size __attribute__ ((__unused__)),
-- const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
-- _Tv __v, const __c_locale& __cloc, int __prec)
-+ inline int
-+ __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+ __cloc __attribute__ ((__unused__))
-+#endif
-+ ,
-+ char* __out,
-+ const int __size,
-+ const char* __fmt, ...)
- {
-+ va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
- __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
-- _Tv __v, const __c_locale&, int __prec)
-- {
- # ifdef __UCLIBC_HAS_LOCALE__
- char* __old = std::setlocale(LC_ALL, NULL);
- char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
-
-- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+ va_start(__args, __fmt);
-+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+ va_end(__args);
-
- #ifdef __UCLIBC_HAS_XCLOCALE__
- __gnu_cxx::__uselocale(__old);
diff --git a/patches/gcc/4.2.0/160-libstdc++-pic.patch b/patches/gcc/4.2.0/160-libstdc++-pic.patch
deleted file mode 100644
index 560bcb2..0000000
--- a/patches/gcc/4.2.0/160-libstdc++-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# DP: Build and install libstdc++_pic.a library.
-
---- gcc/libstdc++-v3/src/Makefile.am
-+++ gcc/libstdc++-v3/src/Makefile.am
-@@ -214,6 +214,12 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-
-
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
---- gcc/libstdc++-v3/src/Makefile.in
-+++ gcc/libstdc++-v3/src/Makefile.in
-@@ -627,7 +627,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -660,6 +660,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -743,6 +743,13 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.2.0/170-missing-execinfo_h.patch b/patches/gcc/4.2.0/170-missing-execinfo_h.patch
deleted file mode 100644
index 0e2092f..0000000
--- a/patches/gcc/4.2.0/170-missing-execinfo_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500
-+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.2.0/180-c99-snprintf.patch b/patches/gcc/4.2.0/180-c99-snprintf.patch
deleted file mode 100644
index d37a6b5..0000000
--- a/patches/gcc/4.2.0/180-c99-snprintf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.2.0.orig/libstdc++-v3/include/c_std/std_cstdio.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.0/libstdc++-v3/include/c_std/std_cstdio.h 2007-05-20 01:05:38.000000000 +0200
-@@ -144,7 +144,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.2.0/190-c99-complex-ugly-hack.patch b/patches/gcc/4.2.0/190-c99-complex-ugly-hack.patch
deleted file mode 100644
index 2ccc80d..0000000
--- a/patches/gcc/4.2.0/190-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/configure-old 2005-04-30 22:04:48.061603912 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 22:06:13.678588152 -0500
-@@ -7194,6 +7194,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.2.0/200-index_macro.patch b/patches/gcc/4.2.0/200-index_macro.patch
deleted file mode 100644
index d8e4765..0000000
--- a/patches/gcc/4.2.0/200-index_macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps 2006-03-24 01:49:51 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/rope 2006-03-24 01:49:37 +0100
-@@ -59,6 +59,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
---- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.2.0/210-libmudflap-susv3-legacy.patch b/patches/gcc/4.2.0/210-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 374b1f8..0000000
--- a/patches/gcc/4.2.0/210-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.2/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834)
-+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy)
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.2.0/220-libstdc++-namespace.patch b/patches/gcc/4.2.0/220-libstdc++-namespace.patch
deleted file mode 100644
index 69587ca..0000000
--- a/patches/gcc/4.2.0/220-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 15:23:41.000000000 +0100
-@@ -32,7 +32,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- this->_S_create_c_locale(this->_M_c_locale_messages, __s);
- }
- }
-+}
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 15:20:31.000000000 +0100
-@@ -33,7 +33,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-@@ -74,3 +75,4 @@
- delete _M_data;
- _S_destroy_c_locale(_M_c_locale_timepunct);
- }
-+}
diff --git a/patches/gcc/4.2.0/230-libbackend_dep_gcov-iov.h.patch b/patches/gcc/4.2.0/230-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 0bf115c..0000000
--- a/patches/gcc/4.2.0/230-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.2/gcc/Makefile.in
-===================================================================
---- gcc-4.2/gcc/Makefile.in (revision 121758)
-+++ gcc-4.2/gcc/Makefile.in (working copy)
-@@ -2658,7 +2658,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H)
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
- insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DTARGET_NAME=\"$(target_noncanonical)\" \
- -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc/4.2.0/240-arm-bigendian.patch b/patches/gcc/4.2.0/240-arm-bigendian.patch
deleted file mode 100644
index 07c6093..0000000
--- a/patches/gcc/4.2.0/240-arm-bigendian.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.2.0/gcc/config/arm/linux-elf.h
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h
-@@ -28,19 +28,33 @@
- #undef TARGET_VERSION
- #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-@@ -61,7 +75,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #undef LINK_SPEC
---- gcc-4.2.0/gcc/config.gcc.orig 2006-09-22 14:53:41.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc 2006-09-25 10:45:21.000000000 +0200
-@@ -696,6 +696,11 @@
- tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ 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"
diff --git a/patches/gcc/4.2.0/250-softfloat-fix.patch b/patches/gcc/4.2.0/250-softfloat-fix.patch
deleted file mode 100644
index 3517856..0000000
--- a/patches/gcc/4.2.0/250-softfloat-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch (C) 2007 Yann E. MORIN
-Licensed under GPL v2.
-
-First hunk of this patch solves compiling uClibc:
-
-make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
- LD libuClibc-0.9.29.so
-libc/libc_so.a(difftime.os): In function `difftime':
-difftime.c:(.text+0x8): undefined reference to `__floatsidf'
-difftime.c:(.text+0x2c): undefined reference to `__subdf3'
-libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
-_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
-_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
-_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
-_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
-_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
-_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
-_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
-libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
-__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
-libc/libc_so.a(strtof.os): In function `strtof':
-strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
-/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
-In function `__fixunsdfsi':
-libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
-make[2]: *** [lib/libc.so] Error 1
-make[1]: *** [lib/libc.so.0] Error 2
-make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
-make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
-Error 2
-
-The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
-
-
-diff -dur gcc-4.2.0.orig/gcc/config.gcc gcc-4.2.0/gcc/config.gcc
---- gcc-4.2.0.orig/gcc/config.gcc 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc 2007-07-15 11:26:02.000000000 +0200
-@@ -721,7 +721,7 @@
- default_use_cxa_atexit=yes
- ;;
- *)
-- tmake_file="$tmake_file arm/t-linux"
-+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
- ;;
- esac
- tm_file="$tm_file arm/aout.h arm/arm.h"
-diff -dur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-07-15 11:26:02.000000000 +0200
-@@ -63,7 +63,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.2.0/260-flatten-switch-stmt-00.patch b/patches/gcc/4.2.0/260-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8fac37c..0000000
--- a/patches/gcc/4.2.0/260-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-Index: gcc-4.2.0/gcc/stmt.c
-===================================================================
---- gcc-4.2.0.orig/gcc/stmt.c (revision 123843)
-+++ gcc-4.2.0/gcc/stmt.c (working copy)
-@@ -2517,7 +2517,11 @@ expand_case (tree exp)
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3075,6 +3079,7 @@ emit_case_nodes (rtx index, case_node_pt
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
-
-
-Content-Type: text/x-csrc; charset=us-ascii
-Content-Disposition: attachment; filename="switch.c"
-
-int
-commutative_tree_code (int code)
-{
-#define CASE(val, ret) case val:/* __asm__("# val="#val ",ret="#ret);*/ return ret;
-#ifndef CHAIN
- switch (code)
- {
-# if 1
- CASE(1,3)
- CASE(3,2)
- CASE(5,8)
- CASE(7,1)
- CASE(33,4)
- CASE(44,9)
- CASE(55,10)
- CASE(66,-1)
- CASE(77,99)
- CASE(666,0)
-# else
- case 1:
- return 3;
- case 3:
- return 2;
- case 5:
- return 8;
- case 7:
- return 1;
- case 33:
- return 4;
- case 44:
- return 9;
- case 55:
- return 10;
- case 66:
- return -1;
- case 77:
- return 99;
- case 666:
- return 0;
-# endif
- default:
- break;
- }
- return 4711;
-
-#else
- if (code == 1)
- return 3;
- else if (code == 3)
- return 2;
- else if (code == 5)
- return 8;
- else if (code == 7)
- return 1;
- else if (code == 33)
- return 4;
- else if (code == 44)
- return 9;
- else if (code == 55)
- return 10;
- else if (code == 66)
- return -1;
- else if (code == 77)
- return 99;
- else if (code == 666)
- return 0;
- else
- return 4711;
-#endif
-}
-
-
---AhhlLboLdkugWU4S--
-
diff --git a/patches/gcc/4.2.0/270-soft-float.patch b/patches/gcc/4.2.0/270-soft-float.patch
deleted file mode 100644
index 4287bfa..0000000
--- a/patches/gcc/4.2.0/270-soft-float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
---- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c 2007-03-05 11:54:00.000000000 -0500
-+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c 2008-01-31 17:51:24.000000000 -0500
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
- but GCC currently generates poor code when a union is used to turn
- a long double into a pair of doubles. */
-
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
- return z.ldval;
- }
-
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);
diff --git a/patches/gcc/4.2.0/280-alpha-signal_h.patch b/patches/gcc/4.2.0/280-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.2.0/280-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.2.0/290-sh-without-headers.patch b/patches/gcc/4.2.0/290-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.2.0/290-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.2.0/300-libgcc_eh.a.patch b/patches/gcc/4.2.0/300-libgcc_eh.a.patch
deleted file mode 100644
index 909db3a..0000000
--- a/patches/gcc/4.2.0/300-libgcc_eh.a.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Vampirised from:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
---- gcc-4.2.2.orig/gcc/mklibgcc.in 2006-07-04 22:20:01.000000000 +0200
-+++ gcc-4.2.2/gcc/mklibgcc.in 2011-08-31 16:24:03.674690016 +0200
-@@ -223,8 +223,8 @@
- if [ "$LIBUNWIND" ]; then
- libunwind_a=$dir/libunwind.a
- fi
-+ libgcc_eh_a=$dir/libgcc_eh.a
- if [ "$SHLIB_LINK" ]; then
-- libgcc_eh_a=$dir/libgcc_eh.a
- libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
- if [ "$LIBUNWIND" ]; then
- libunwind_so=$dir/libunwind${SHLIB_EXT}
-@@ -889,11 +889,11 @@
- echo ' chmod 644' ${ldir}/libgcov.a
- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
-
-- if [ "$SHLIB_LINK" ]; then
-- echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-- echo ' chmod 644' ${ldir}/libgcc_eh.a
-- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-+ echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-+ echo ' chmod 644' ${ldir}/libgcc_eh.a
-+ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-
-+ if [ "$SHLIB_LINK" ]; then
- shlib_slibdir_qual=
- os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
- if [ "$os_multilib_dir" != . ]; then
diff --git a/patches/gcc/4.2.1/100-uclibc-conf.patch b/patches/gcc/4.2.1/100-uclibc-conf.patch
deleted file mode 100644
index 7261dae..0000000
--- a/patches/gcc/4.2.1/100-uclibc-conf.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/configure gcc-4.2.1/boehm-gc/configure
---- gcc-4.2.1.orig/boehm-gc/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4323,7 +4323,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/contrib/regression/objs-gcc.sh gcc-4.2.1/contrib/regression/objs-gcc.sh
---- gcc-4.2.1.orig/contrib/regression/objs-gcc.sh 2005-08-15 02:41:31.000000000 +0200
-+++ gcc-4.2.1/contrib/regression/objs-gcc.sh 2007-08-03 20:29:22.000000000 +0200
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.2.1.orig/gcc/config/cris/linux.h gcc-4.2.1/gcc/config/cris/linux.h
---- gcc-4.2.1.orig/gcc/config/cris/linux.h 2006-02-18 12:12:51.000000000 +0100
-+++ gcc-4.2.1/gcc/config/cris/linux.h 2007-08-03 20:29:22.000000000 +0200
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
-diff -durN gcc-4.2.1.orig/libffi/configure gcc-4.2.1/libffi/configure
---- gcc-4.2.1.orig/libffi/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libffi/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3460,7 +3460,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgfortran/configure gcc-4.2.1/libgfortran/configure
---- gcc-4.2.1.orig/libgfortran/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgfortran/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3721,7 +3721,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgomp/configure gcc-4.2.1/libgomp/configure
---- gcc-4.2.1.orig/libgomp/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgomp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3893,7 +3893,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/configure gcc-4.2.1/libjava/classpath/configure
---- gcc-4.2.1.orig/libjava/classpath/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/libjava/classpath/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5307,7 +5307,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/ltconfig gcc-4.2.1/libjava/classpath/ltconfig
---- gcc-4.2.1.orig/libjava/classpath/ltconfig 2006-08-07 22:37:50.000000000 +0200
-+++ gcc-4.2.1/libjava/classpath/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/libjava/configure gcc-4.2.1/libjava/configure
---- gcc-4.2.1.orig/libjava/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libjava/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5424,7 +5424,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libmudflap/configure gcc-4.2.1/libmudflap/configure
---- gcc-4.2.1.orig/libmudflap/configure 2006-12-04 12:13:07.000000000 +0100
-+++ gcc-4.2.1/libmudflap/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5394,7 +5394,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libobjc/configure gcc-4.2.1/libobjc/configure
---- gcc-4.2.1.orig/libobjc/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libobjc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3314,7 +3314,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libssp/configure gcc-4.2.1/libssp/configure
---- gcc-4.2.1.orig/libssp/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libssp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4480,7 +4480,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4283,7 +4283,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libtool.m4 gcc-4.2.1/libtool.m4
---- gcc-4.2.1.orig/libtool.m4 2005-07-16 04:30:53.000000000 +0200
-+++ gcc-4.2.1/libtool.m4 2007-08-03 20:29:22.000000000 +0200
-@@ -739,7 +739,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/ltconfig gcc-4.2.1/ltconfig
---- gcc-4.2.1.orig/ltconfig 2007-02-14 18:08:35.000000000 +0100
-+++ gcc-4.2.1/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/zlib/configure gcc-4.2.1/zlib/configure
---- gcc-4.2.1.orig/zlib/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/zlib/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3429,7 +3429,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
diff --git a/patches/gcc/4.2.1/110-uclibc-conf-noupstream.patch b/patches/gcc/4.2.1/110-uclibc-conf-noupstream.patch
deleted file mode 100644
index 1c239d6..0000000
--- a/patches/gcc/4.2.1/110-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-02-03 06:25:20.000000000 +0100
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-@@ -1964,7 +1964,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.2.1/120-uclibc-locale.patch b/patches/gcc/4.2.1/120-uclibc-locale.patch
deleted file mode 100644
index 298c505..0000000
--- a/patches/gcc/4.2.1/120-uclibc-locale.patch
+++ /dev/null
@@ -1,2806 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 gcc-4.2.1/libstdc++-v3/acinclude.m4
---- gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/acinclude.m4 2007-08-03 20:30:21.000000000 +0200
-@@ -1334,7 +1334,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # Deal with gettext issues. Default to not using it (=no) until we detect
- # support for it later. Let the user turn it off via --e/d, but let that
-@@ -1355,6 +1355,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -1526,6 +1529,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out,
-+ const int __size __attribute__ ((__unused__)),
-+ const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ ;
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-@@ -5769,7 +5769,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5802,6 +5802,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -6190,6 +6193,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -182,7 +182,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.2.1/130-uclibc-locale-no__x.patch b/patches/gcc/4.2.1/130-uclibc-locale-no__x.patch
deleted file mode 100644
index d88dc22..0000000
--- a/patches/gcc/4.2.1/130-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
--#define __strtof_l(S, E, L) strtof((S), (E))
--#define __strtod_l(S, E, L) strtod((S), (E))
--#define __strtold_l(S, E, L) strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c) NULL
--#define __freelocale(a) ((void)0)
--#define __duplocale(a) __c_locale()
--#endif
--
- namespace std
- {
- template<>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-@@ -68,6 +68,7 @@
- {
- extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
-
- namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:53.000000000 +0200
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif
-
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l iswctype_l
-+# define __towlower_l towlower_l
-+# define __towupper_l towupper_l
-+# define __wcscoll_l wcscoll_l
-+# define __wcsftime_l wcsftime_l
-+# define __wcsxfrm_l wcsxfrm_l
-+# define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L) nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+# define __strtod_l(S, E, L) strtod((S), (E))
-+# define __strtof_l(S, E, L) strtof((S), (E))
-+# define __strtold_l(S, E, L) strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c) NULL
-+# define __freelocale(a) ((void)0)
-+# define __duplocale(a) __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l(C, M, L) iswctype((C), (M))
-+# define __towlower_l(C, L) towlower((C))
-+# define __towupper_l(C, L) towupper((C))
-+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
-+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+# define __wctype_l(S, L) wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
- // These are basically extensions to char_traits, and perhaps should
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L) wctype((S))
--#define __towupper_l(C, L) towupper((C))
--#define __towlower_l(C, L) towlower((C))
--#define __iswctype_l(C, M, L) iswctype((C), (M))
--#endif
--
- namespace std
- {
- // NB: The other ctype<char> specializations are in src/locale.cc and
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
-- const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
-- const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D) ((void)0)
--#define __bindtextdomain(D,P) ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D) ((void)0)
-+#define bindtextdomain(D,P) ((void)0)
- #endif
-
- // Non-virtual member functions.
-@@ -70,7 +66,7 @@
- messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
- const char* __dir) const
- {
-- __bindtextdomain(__s.c_str(), __dir);
-+ bindtextdomain(__s.c_str(), __dir);
- return this->do_open(__s, __loc);
- }
-
-@@ -90,7 +86,7 @@
- {
- // No error checking is done, assume the catalog exists and can
- // be used.
-- __textdomain(__s.c_str());
-+ textdomain(__s.c_str());
- return 0;
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
--
- namespace std
- {
- // Construct and return valid pattern consisting of some combination of:
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
diff --git a/patches/gcc/4.2.1/140-uclibc-locale-wchar_fix.patch b/patches/gcc/4.2.1/140-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 077bb56..0000000
--- a/patches/gcc/4.2.1/140-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -127,12 +127,25 @@
- {
- // Named locale.
- // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- union { char *__s; wchar_t __w; } __u;
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- _M_data->_M_decimal_point = __u.__w;
-
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- _M_data->_M_thousands_sep = __u.__w;
-+#endif
-
- if (_M_data->_M_thousands_sep == L'\0')
- _M_data->_M_grouping = "";
diff --git a/patches/gcc/4.2.1/150-uclibc-locale-update.patch b/patches/gcc/4.2.1/150-uclibc-locale-update.patch
deleted file mode 100644
index 534f4e4..0000000
--- a/patches/gcc/4.2.1/150-uclibc-locale-update.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -46,16 +46,13 @@
- __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- float __f = __strtof_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __f;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -63,16 +60,13 @@
- __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- double __d = __strtod_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __d;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -80,16 +74,13 @@
- __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- long double __ld = __strtold_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __ld;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- void
-@@ -110,7 +101,7 @@
- void
- locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
- {
-- if (_S_get_c_locale() != __cloc)
-+ if (__cloc && _S_get_c_locale() != __cloc)
- __freelocale(__cloc);
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:31:54.000000000 +0200
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
-
- #include <cstring> // get std::strlen
--#include <cstdio> // get std::snprintf or std::sprintf
-+#include <cstdio> // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h> // For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h> // For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> // For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h> // For messages
- #endif
-+#include <cstdarg>
-
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
-
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
--
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
- typedef int* __c_locale;
- #endif
-
-- // Convert numeric value of type _Tv to string and return length of
-- // string. If snprintf is available use it, otherwise fall back to
-- // the unsafe sprintf which, in general, can be dangerous and should
-+ // Convert numeric value of type double to string and return length of
-+ // string. If vsnprintf is available use it, otherwise fall back to
-+ // the unsafe vsprintf which, in general, can be dangerous and should
- // be avoided.
-- template<typename _Tv>
-- int
-- __convert_from_v(char* __out,
-- const int __size __attribute__ ((__unused__)),
-- const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
-- _Tv __v, const __c_locale& __cloc, int __prec)
-+ inline int
-+ __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+ __cloc __attribute__ ((__unused__))
-+#endif
-+ ,
-+ char* __out,
-+ const int __size,
-+ const char* __fmt, ...)
- {
-+ va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
- __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
-- _Tv __v, const __c_locale&, int __prec)
-- {
- # ifdef __UCLIBC_HAS_LOCALE__
- char* __old = std::setlocale(LC_ALL, NULL);
- char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
-
-- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+ va_start(__args, __fmt);
-+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+ va_end(__args);
-
- #ifdef __UCLIBC_HAS_XCLOCALE__
- __gnu_cxx::__uselocale(__old);
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- namespace std
-@@ -138,20 +143,34 @@
- ctype<wchar_t>::
- do_is(mask __m, wchar_t __c) const
- {
-- // Highest bitmask in ctype_base == 10, but extra in "C"
-- // library for blank.
-+ // The case of __m == ctype_base::space is particularly important,
-+ // due to its use in many istream functions. Therefore we deal with
-+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+ // is the mask corresponding to ctype_base::space. NB: an encoding
-+ // change would not affect correctness!
- bool __ret = false;
-- const size_t __bitmasksize = 11;
-- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-- if (__m & _M_bit[__bitcur]
-- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-- {
-- __ret = true;
-- break;
-- }
-+ if (__m == _M_bit[5])
-+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+ else
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur])
-+ {
-+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ else if (__m == _M_bit[__bitcur])
-+ break;
-+ }
-+ }
- return __ret;
- }
--
-+
- const wchar_t*
- ctype<wchar_t>::
- do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -47,18 +47,21 @@
- template<typename _CharT>
- messages<_CharT>::messages(size_t __refs)
- : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-- _M_name_messages(_S_get_c_name())
-+ _M_name_messages(_S_get_c_name())
- { }
-
- template<typename _CharT>
- messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- size_t __refs)
-- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-- _M_name_messages(__s)
-+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_messages = __tmp;
-+
-+ // Last to avoid leaking memory if new throws.
-+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
- }
-
- template<typename _CharT>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- }
- break;
- default:
-- ;
-+ __ret = pattern();
- }
- return __ret;
- }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -37,25 +37,33 @@
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
- : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(__s)
-+ _M_name_timepunct(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_timepunct = __tmp;
-- _M_initialize_timepunct(__cloc);
-+
-+ try
-+ { _M_initialize_timepunct(__cloc); }
-+ catch(...)
-+ {
-+ delete [] _M_name_timepunct;
-+ __throw_exception_again;
-+ }
- }
-
- template<typename _CharT>
diff --git a/patches/gcc/4.2.1/160-libstdc++-pic.patch b/patches/gcc/4.2.1/160-libstdc++-pic.patch
deleted file mode 100644
index 7244d4c..0000000
--- a/patches/gcc/4.2.1/160-libstdc++-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am 2006-07-28 06:57:34.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.am 2007-08-03 20:32:27.000000000 +0200
-@@ -257,6 +257,12 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.in 2007-08-03 20:32:27.000000000 +0200
-@@ -657,7 +657,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -690,6 +690,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -799,6 +800,13 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.2.1/170-missing-execinfo_h.patch b/patches/gcc/4.2.1/170-missing-execinfo_h.patch
deleted file mode 100644
index ff67899..0000000
--- a/patches/gcc/4.2.1/170-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/include/gc.h gcc-4.2.1/boehm-gc/include/gc.h
---- gcc-4.2.1.orig/boehm-gc/include/gc.h 2006-09-18 20:45:08.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/include/gc.h 2007-08-03 20:33:00.000000000 +0200
-@@ -502,7 +502,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.2.1/180-c99-snprintf.patch b/patches/gcc/4.2.1/180-c99-snprintf.patch
deleted file mode 100644
index ddb0c34..0000000
--- a/patches/gcc/4.2.1/180-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h 2007-08-03 20:33:24.000000000 +0200
-@@ -144,7 +144,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.2.1/190-c99-complex-ugly-hack.patch b/patches/gcc/4.2.1/190-c99-complex-ugly-hack.patch
deleted file mode 100644
index de6d71c..0000000
--- a/patches/gcc/4.2.1/190-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:33:56.000000000 +0200
-@@ -7514,6 +7514,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.2.1/200-index_macro.patch b/patches/gcc/4.2.1/200-index_macro.patch
deleted file mode 100644
index 1e56b5d..0000000
--- a/patches/gcc/4.2.1/200-index_macro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200
-@@ -58,6 +58,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.2.1/210-libmudflap-susv3-legacy.patch b/patches/gcc/4.2.1/210-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 26e8704..0000000
--- a/patches/gcc/4.2.1/210-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
---- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.2.1/220-libstdc++-namespace.patch b/patches/gcc/4.2.1/220-libstdc++-namespace.patch
deleted file mode 100644
index 709e8f2..0000000
--- a/patches/gcc/4.2.1/220-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -32,7 +32,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- this->_S_create_c_locale(this->_M_c_locale_messages, __s);
- }
- }
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -33,7 +33,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-@@ -74,3 +75,4 @@
- delete _M_data;
- _S_destroy_c_locale(_M_c_locale_timepunct);
- }
-+}
diff --git a/patches/gcc/4.2.1/230-libbackend_dep_gcov-iov.h.patch b/patches/gcc/4.2.1/230-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 32754be..0000000
--- a/patches/gcc/4.2.1/230-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
---- gcc-4.2.1.orig/gcc/Makefile.in 2007-05-31 17:37:38.000000000 +0200
-+++ gcc-4.2.1/gcc/Makefile.in 2007-08-03 20:36:14.000000000 +0200
-@@ -2660,7 +2660,7 @@
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
- insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DTARGET_NAME=\"$(target_noncanonical)\" \
- -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc/4.2.1/240-arm-bigendian.patch b/patches/gcc/4.2.1/240-arm-bigendian.patch
deleted file mode 100644
index 2abeccd..0000000
--- a/patches/gcc/4.2.1/240-arm-bigendian.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config/arm/linux-elf.h gcc-4.2.1/gcc/config/arm/linux-elf.h
---- gcc-4.2.1.orig/gcc/config/arm/linux-elf.h 2006-02-17 00:29:10.000000000 +0100
-+++ gcc-4.2.1/gcc/config/arm/linux-elf.h 2007-08-03 20:36:43.000000000 +0200
-@@ -28,19 +28,33 @@
- #undef TARGET_VERSION
- #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-@@ -61,7 +75,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #undef LINK_SPEC
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:36:43.000000000 +0200
-@@ -705,6 +705,11 @@
- tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ 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"
diff --git a/patches/gcc/4.2.1/250-softfloat-fix.patch b/patches/gcc/4.2.1/250-softfloat-fix.patch
deleted file mode 100644
index 3517856..0000000
--- a/patches/gcc/4.2.1/250-softfloat-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch (C) 2007 Yann E. MORIN
-Licensed under GPL v2.
-
-First hunk of this patch solves compiling uClibc:
-
-make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
- LD libuClibc-0.9.29.so
-libc/libc_so.a(difftime.os): In function `difftime':
-difftime.c:(.text+0x8): undefined reference to `__floatsidf'
-difftime.c:(.text+0x2c): undefined reference to `__subdf3'
-libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
-_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
-_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
-_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
-_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
-_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
-_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
-_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
-libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
-__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
-libc/libc_so.a(strtof.os): In function `strtof':
-strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
-/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
-In function `__fixunsdfsi':
-libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
-make[2]: *** [lib/libc.so] Error 1
-make[1]: *** [lib/libc.so.0] Error 2
-make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
-make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
-Error 2
-
-The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
-
-
-diff -dur gcc-4.2.0.orig/gcc/config.gcc gcc-4.2.0/gcc/config.gcc
---- gcc-4.2.0.orig/gcc/config.gcc 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc 2007-07-15 11:26:02.000000000 +0200
-@@ -721,7 +721,7 @@
- default_use_cxa_atexit=yes
- ;;
- *)
-- tmake_file="$tmake_file arm/t-linux"
-+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
- ;;
- esac
- tm_file="$tm_file arm/aout.h arm/arm.h"
-diff -dur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-07-15 11:26:02.000000000 +0200
-@@ -63,7 +63,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.2.1/260-flatten-switch-stmt-00.patch b/patches/gcc/4.2.1/260-flatten-switch-stmt-00.patch
deleted file mode 100644
index 6c40c57..0000000
--- a/patches/gcc/4.2.1/260-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/stmt.c gcc-4.2.1/gcc/stmt.c
---- gcc-4.2.1.orig/gcc/stmt.c 2007-07-19 05:25:32.000000000 +0200
-+++ gcc-4.2.1/gcc/stmt.c 2007-08-03 20:37:19.000000000 +0200
-@@ -2512,7 +2512,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3070,6 +3074,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.2.1/270-soft-float.patch b/patches/gcc/4.2.1/270-soft-float.patch
deleted file mode 100644
index 4287bfa..0000000
--- a/patches/gcc/4.2.1/270-soft-float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
---- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c 2007-03-05 11:54:00.000000000 -0500
-+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c 2008-01-31 17:51:24.000000000 -0500
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
- but GCC currently generates poor code when a union is used to turn
- a long double into a pair of doubles. */
-
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
- return z.ldval;
- }
-
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);
diff --git a/patches/gcc/4.2.1/280-alpha-signal_h.patch b/patches/gcc/4.2.1/280-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.2.1/280-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.2.1/290-sh-without-headers.patch b/patches/gcc/4.2.1/290-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.2.1/290-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.2.1/300-libstdc++-nostdlib-linking.patch b/patches/gcc/4.2.1/300-libstdc++-nostdlib-linking.patch
deleted file mode 100644
index 5658f1a..0000000
--- a/patches/gcc/4.2.1/300-libstdc++-nostdlib-linking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-On 20090401, Ted Jordan writes:
- The generated libtool for building libstdc++ adds the -nostdlib option to the
- g++ command for linking but doesn't add -lgcc. This causes a "hidden symbol"
- error when linking against the libstdc++ shared object. This patch adds gcc
- to the list of libraries linked against when linking libstdc++.
-
-Index: gcc-4.2.1/ltcf-cxx.sh
-===================================================================
---- gcc-4.2.1.orig/ltcf-cxx.sh 2005-07-15 21:30:53.000000000 -0500
-+++ gcc-4.2.1/ltcf-cxx.sh 2009-04-02 09:30:34.000000000 -0500
-@@ -78,8 +78,8 @@
- # to be the same.
-
- if test "$with_gnu_ld" = yes; then
-- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -lgcc ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -lgcc ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
diff --git a/patches/gcc/4.2.1/310-libgcc_eh.a.patch b/patches/gcc/4.2.1/310-libgcc_eh.a.patch
deleted file mode 100644
index 909db3a..0000000
--- a/patches/gcc/4.2.1/310-libgcc_eh.a.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Vampirised from:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
---- gcc-4.2.2.orig/gcc/mklibgcc.in 2006-07-04 22:20:01.000000000 +0200
-+++ gcc-4.2.2/gcc/mklibgcc.in 2011-08-31 16:24:03.674690016 +0200
-@@ -223,8 +223,8 @@
- if [ "$LIBUNWIND" ]; then
- libunwind_a=$dir/libunwind.a
- fi
-+ libgcc_eh_a=$dir/libgcc_eh.a
- if [ "$SHLIB_LINK" ]; then
-- libgcc_eh_a=$dir/libgcc_eh.a
- libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
- if [ "$LIBUNWIND" ]; then
- libunwind_so=$dir/libunwind${SHLIB_EXT}
-@@ -889,11 +889,11 @@
- echo ' chmod 644' ${ldir}/libgcov.a
- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
-
-- if [ "$SHLIB_LINK" ]; then
-- echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-- echo ' chmod 644' ${ldir}/libgcc_eh.a
-- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-+ echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-+ echo ' chmod 644' ${ldir}/libgcc_eh.a
-+ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-
-+ if [ "$SHLIB_LINK" ]; then
- shlib_slibdir_qual=
- os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
- if [ "$os_multilib_dir" != . ]; then
diff --git a/patches/gcc/4.2.2/100-uclibc-conf.patch b/patches/gcc/4.2.2/100-uclibc-conf.patch
deleted file mode 100644
index 7261dae..0000000
--- a/patches/gcc/4.2.2/100-uclibc-conf.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/configure gcc-4.2.1/boehm-gc/configure
---- gcc-4.2.1.orig/boehm-gc/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4323,7 +4323,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/contrib/regression/objs-gcc.sh gcc-4.2.1/contrib/regression/objs-gcc.sh
---- gcc-4.2.1.orig/contrib/regression/objs-gcc.sh 2005-08-15 02:41:31.000000000 +0200
-+++ gcc-4.2.1/contrib/regression/objs-gcc.sh 2007-08-03 20:29:22.000000000 +0200
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.2.1.orig/gcc/config/cris/linux.h gcc-4.2.1/gcc/config/cris/linux.h
---- gcc-4.2.1.orig/gcc/config/cris/linux.h 2006-02-18 12:12:51.000000000 +0100
-+++ gcc-4.2.1/gcc/config/cris/linux.h 2007-08-03 20:29:22.000000000 +0200
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
-diff -durN gcc-4.2.1.orig/libffi/configure gcc-4.2.1/libffi/configure
---- gcc-4.2.1.orig/libffi/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libffi/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3460,7 +3460,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgfortran/configure gcc-4.2.1/libgfortran/configure
---- gcc-4.2.1.orig/libgfortran/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgfortran/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3721,7 +3721,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgomp/configure gcc-4.2.1/libgomp/configure
---- gcc-4.2.1.orig/libgomp/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgomp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3893,7 +3893,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/configure gcc-4.2.1/libjava/classpath/configure
---- gcc-4.2.1.orig/libjava/classpath/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/libjava/classpath/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5307,7 +5307,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/ltconfig gcc-4.2.1/libjava/classpath/ltconfig
---- gcc-4.2.1.orig/libjava/classpath/ltconfig 2006-08-07 22:37:50.000000000 +0200
-+++ gcc-4.2.1/libjava/classpath/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/libjava/configure gcc-4.2.1/libjava/configure
---- gcc-4.2.1.orig/libjava/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libjava/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5424,7 +5424,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libmudflap/configure gcc-4.2.1/libmudflap/configure
---- gcc-4.2.1.orig/libmudflap/configure 2006-12-04 12:13:07.000000000 +0100
-+++ gcc-4.2.1/libmudflap/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5394,7 +5394,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libobjc/configure gcc-4.2.1/libobjc/configure
---- gcc-4.2.1.orig/libobjc/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libobjc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3314,7 +3314,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libssp/configure gcc-4.2.1/libssp/configure
---- gcc-4.2.1.orig/libssp/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libssp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4480,7 +4480,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4283,7 +4283,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libtool.m4 gcc-4.2.1/libtool.m4
---- gcc-4.2.1.orig/libtool.m4 2005-07-16 04:30:53.000000000 +0200
-+++ gcc-4.2.1/libtool.m4 2007-08-03 20:29:22.000000000 +0200
-@@ -739,7 +739,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/ltconfig gcc-4.2.1/ltconfig
---- gcc-4.2.1.orig/ltconfig 2007-02-14 18:08:35.000000000 +0100
-+++ gcc-4.2.1/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/zlib/configure gcc-4.2.1/zlib/configure
---- gcc-4.2.1.orig/zlib/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/zlib/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3429,7 +3429,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
diff --git a/patches/gcc/4.2.2/110-uclibc-conf-noupstream.patch b/patches/gcc/4.2.2/110-uclibc-conf-noupstream.patch
deleted file mode 100644
index 1c239d6..0000000
--- a/patches/gcc/4.2.2/110-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-02-03 06:25:20.000000000 +0100
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-@@ -1964,7 +1964,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.2.2/120-uclibc-locale.patch b/patches/gcc/4.2.2/120-uclibc-locale.patch
deleted file mode 100644
index 298c505..0000000
--- a/patches/gcc/4.2.2/120-uclibc-locale.patch
+++ /dev/null
@@ -1,2806 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 gcc-4.2.1/libstdc++-v3/acinclude.m4
---- gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/acinclude.m4 2007-08-03 20:30:21.000000000 +0200
-@@ -1334,7 +1334,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # Deal with gettext issues. Default to not using it (=no) until we detect
- # support for it later. Let the user turn it off via --e/d, but let that
-@@ -1355,6 +1355,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -1526,6 +1529,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out,
-+ const int __size __attribute__ ((__unused__)),
-+ const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ ;
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-@@ -5769,7 +5769,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5802,6 +5802,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -6190,6 +6193,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -182,7 +182,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.2.2/130-uclibc-locale-no__x.patch b/patches/gcc/4.2.2/130-uclibc-locale-no__x.patch
deleted file mode 100644
index d88dc22..0000000
--- a/patches/gcc/4.2.2/130-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
--#define __strtof_l(S, E, L) strtof((S), (E))
--#define __strtod_l(S, E, L) strtod((S), (E))
--#define __strtold_l(S, E, L) strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c) NULL
--#define __freelocale(a) ((void)0)
--#define __duplocale(a) __c_locale()
--#endif
--
- namespace std
- {
- template<>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-@@ -68,6 +68,7 @@
- {
- extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
-
- namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:53.000000000 +0200
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif
-
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l iswctype_l
-+# define __towlower_l towlower_l
-+# define __towupper_l towupper_l
-+# define __wcscoll_l wcscoll_l
-+# define __wcsftime_l wcsftime_l
-+# define __wcsxfrm_l wcsxfrm_l
-+# define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L) nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+# define __strtod_l(S, E, L) strtod((S), (E))
-+# define __strtof_l(S, E, L) strtof((S), (E))
-+# define __strtold_l(S, E, L) strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c) NULL
-+# define __freelocale(a) ((void)0)
-+# define __duplocale(a) __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l(C, M, L) iswctype((C), (M))
-+# define __towlower_l(C, L) towlower((C))
-+# define __towupper_l(C, L) towupper((C))
-+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
-+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+# define __wctype_l(S, L) wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
- // These are basically extensions to char_traits, and perhaps should
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L) wctype((S))
--#define __towupper_l(C, L) towupper((C))
--#define __towlower_l(C, L) towlower((C))
--#define __iswctype_l(C, M, L) iswctype((C), (M))
--#endif
--
- namespace std
- {
- // NB: The other ctype<char> specializations are in src/locale.cc and
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
-- const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
-- const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D) ((void)0)
--#define __bindtextdomain(D,P) ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D) ((void)0)
-+#define bindtextdomain(D,P) ((void)0)
- #endif
-
- // Non-virtual member functions.
-@@ -70,7 +66,7 @@
- messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
- const char* __dir) const
- {
-- __bindtextdomain(__s.c_str(), __dir);
-+ bindtextdomain(__s.c_str(), __dir);
- return this->do_open(__s, __loc);
- }
-
-@@ -90,7 +86,7 @@
- {
- // No error checking is done, assume the catalog exists and can
- // be used.
-- __textdomain(__s.c_str());
-+ textdomain(__s.c_str());
- return 0;
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
--
- namespace std
- {
- // Construct and return valid pattern consisting of some combination of:
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
diff --git a/patches/gcc/4.2.2/140-uclibc-locale-wchar_fix.patch b/patches/gcc/4.2.2/140-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 077bb56..0000000
--- a/patches/gcc/4.2.2/140-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -127,12 +127,25 @@
- {
- // Named locale.
- // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- union { char *__s; wchar_t __w; } __u;
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- _M_data->_M_decimal_point = __u.__w;
-
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- _M_data->_M_thousands_sep = __u.__w;
-+#endif
-
- if (_M_data->_M_thousands_sep == L'\0')
- _M_data->_M_grouping = "";
diff --git a/patches/gcc/4.2.2/150-uclibc-locale-update.patch b/patches/gcc/4.2.2/150-uclibc-locale-update.patch
deleted file mode 100644
index 534f4e4..0000000
--- a/patches/gcc/4.2.2/150-uclibc-locale-update.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -46,16 +46,13 @@
- __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- float __f = __strtof_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __f;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -63,16 +60,13 @@
- __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- double __d = __strtod_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __d;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -80,16 +74,13 @@
- __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- long double __ld = __strtold_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __ld;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- void
-@@ -110,7 +101,7 @@
- void
- locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
- {
-- if (_S_get_c_locale() != __cloc)
-+ if (__cloc && _S_get_c_locale() != __cloc)
- __freelocale(__cloc);
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:31:54.000000000 +0200
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
-
- #include <cstring> // get std::strlen
--#include <cstdio> // get std::snprintf or std::sprintf
-+#include <cstdio> // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h> // For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h> // For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> // For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h> // For messages
- #endif
-+#include <cstdarg>
-
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
-
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
--
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
- typedef int* __c_locale;
- #endif
-
-- // Convert numeric value of type _Tv to string and return length of
-- // string. If snprintf is available use it, otherwise fall back to
-- // the unsafe sprintf which, in general, can be dangerous and should
-+ // Convert numeric value of type double to string and return length of
-+ // string. If vsnprintf is available use it, otherwise fall back to
-+ // the unsafe vsprintf which, in general, can be dangerous and should
- // be avoided.
-- template<typename _Tv>
-- int
-- __convert_from_v(char* __out,
-- const int __size __attribute__ ((__unused__)),
-- const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
-- _Tv __v, const __c_locale& __cloc, int __prec)
-+ inline int
-+ __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+ __cloc __attribute__ ((__unused__))
-+#endif
-+ ,
-+ char* __out,
-+ const int __size,
-+ const char* __fmt, ...)
- {
-+ va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
- __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
-- _Tv __v, const __c_locale&, int __prec)
-- {
- # ifdef __UCLIBC_HAS_LOCALE__
- char* __old = std::setlocale(LC_ALL, NULL);
- char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
-
-- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+ va_start(__args, __fmt);
-+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+ va_end(__args);
-
- #ifdef __UCLIBC_HAS_XCLOCALE__
- __gnu_cxx::__uselocale(__old);
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- namespace std
-@@ -138,20 +143,34 @@
- ctype<wchar_t>::
- do_is(mask __m, wchar_t __c) const
- {
-- // Highest bitmask in ctype_base == 10, but extra in "C"
-- // library for blank.
-+ // The case of __m == ctype_base::space is particularly important,
-+ // due to its use in many istream functions. Therefore we deal with
-+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+ // is the mask corresponding to ctype_base::space. NB: an encoding
-+ // change would not affect correctness!
- bool __ret = false;
-- const size_t __bitmasksize = 11;
-- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-- if (__m & _M_bit[__bitcur]
-- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-- {
-- __ret = true;
-- break;
-- }
-+ if (__m == _M_bit[5])
-+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+ else
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur])
-+ {
-+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ else if (__m == _M_bit[__bitcur])
-+ break;
-+ }
-+ }
- return __ret;
- }
--
-+
- const wchar_t*
- ctype<wchar_t>::
- do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -47,18 +47,21 @@
- template<typename _CharT>
- messages<_CharT>::messages(size_t __refs)
- : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-- _M_name_messages(_S_get_c_name())
-+ _M_name_messages(_S_get_c_name())
- { }
-
- template<typename _CharT>
- messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- size_t __refs)
-- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-- _M_name_messages(__s)
-+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_messages = __tmp;
-+
-+ // Last to avoid leaking memory if new throws.
-+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
- }
-
- template<typename _CharT>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- }
- break;
- default:
-- ;
-+ __ret = pattern();
- }
- return __ret;
- }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -37,25 +37,33 @@
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
- : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(__s)
-+ _M_name_timepunct(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_timepunct = __tmp;
-- _M_initialize_timepunct(__cloc);
-+
-+ try
-+ { _M_initialize_timepunct(__cloc); }
-+ catch(...)
-+ {
-+ delete [] _M_name_timepunct;
-+ __throw_exception_again;
-+ }
- }
-
- template<typename _CharT>
diff --git a/patches/gcc/4.2.2/160-libstdc++-pic.patch b/patches/gcc/4.2.2/160-libstdc++-pic.patch
deleted file mode 100644
index 7244d4c..0000000
--- a/patches/gcc/4.2.2/160-libstdc++-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am 2006-07-28 06:57:34.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.am 2007-08-03 20:32:27.000000000 +0200
-@@ -257,6 +257,12 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.in 2007-08-03 20:32:27.000000000 +0200
-@@ -657,7 +657,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -690,6 +690,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -799,6 +800,13 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.2.2/170-missing-execinfo_h.patch b/patches/gcc/4.2.2/170-missing-execinfo_h.patch
deleted file mode 100644
index ff67899..0000000
--- a/patches/gcc/4.2.2/170-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/include/gc.h gcc-4.2.1/boehm-gc/include/gc.h
---- gcc-4.2.1.orig/boehm-gc/include/gc.h 2006-09-18 20:45:08.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/include/gc.h 2007-08-03 20:33:00.000000000 +0200
-@@ -502,7 +502,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.2.2/180-c99-snprintf.patch b/patches/gcc/4.2.2/180-c99-snprintf.patch
deleted file mode 100644
index ddb0c34..0000000
--- a/patches/gcc/4.2.2/180-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h 2007-08-03 20:33:24.000000000 +0200
-@@ -144,7 +144,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.2.2/190-c99-complex-ugly-hack.patch b/patches/gcc/4.2.2/190-c99-complex-ugly-hack.patch
deleted file mode 100644
index de6d71c..0000000
--- a/patches/gcc/4.2.2/190-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:33:56.000000000 +0200
-@@ -7514,6 +7514,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.2.2/200-index_macro.patch b/patches/gcc/4.2.2/200-index_macro.patch
deleted file mode 100644
index 1e56b5d..0000000
--- a/patches/gcc/4.2.2/200-index_macro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200
-@@ -58,6 +58,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.2.2/210-libmudflap-susv3-legacy.patch b/patches/gcc/4.2.2/210-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 26e8704..0000000
--- a/patches/gcc/4.2.2/210-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
---- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.2.2/220-libstdc++-namespace.patch b/patches/gcc/4.2.2/220-libstdc++-namespace.patch
deleted file mode 100644
index 709e8f2..0000000
--- a/patches/gcc/4.2.2/220-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -32,7 +32,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- this->_S_create_c_locale(this->_M_c_locale_messages, __s);
- }
- }
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -33,7 +33,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-@@ -74,3 +75,4 @@
- delete _M_data;
- _S_destroy_c_locale(_M_c_locale_timepunct);
- }
-+}
diff --git a/patches/gcc/4.2.2/230-libbackend_dep_gcov-iov.h.patch b/patches/gcc/4.2.2/230-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 32754be..0000000
--- a/patches/gcc/4.2.2/230-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
---- gcc-4.2.1.orig/gcc/Makefile.in 2007-05-31 17:37:38.000000000 +0200
-+++ gcc-4.2.1/gcc/Makefile.in 2007-08-03 20:36:14.000000000 +0200
-@@ -2660,7 +2660,7 @@
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
- insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DTARGET_NAME=\"$(target_noncanonical)\" \
- -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc/4.2.2/240-arm-bigendian.patch b/patches/gcc/4.2.2/240-arm-bigendian.patch
deleted file mode 100644
index 2abeccd..0000000
--- a/patches/gcc/4.2.2/240-arm-bigendian.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config/arm/linux-elf.h gcc-4.2.1/gcc/config/arm/linux-elf.h
---- gcc-4.2.1.orig/gcc/config/arm/linux-elf.h 2006-02-17 00:29:10.000000000 +0100
-+++ gcc-4.2.1/gcc/config/arm/linux-elf.h 2007-08-03 20:36:43.000000000 +0200
-@@ -28,19 +28,33 @@
- #undef TARGET_VERSION
- #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-@@ -61,7 +75,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #undef LINK_SPEC
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:36:43.000000000 +0200
-@@ -705,6 +705,11 @@
- tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ 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"
diff --git a/patches/gcc/4.2.2/250-softfloat-fix.patch b/patches/gcc/4.2.2/250-softfloat-fix.patch
deleted file mode 100644
index 3517856..0000000
--- a/patches/gcc/4.2.2/250-softfloat-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch (C) 2007 Yann E. MORIN
-Licensed under GPL v2.
-
-First hunk of this patch solves compiling uClibc:
-
-make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
- LD libuClibc-0.9.29.so
-libc/libc_so.a(difftime.os): In function `difftime':
-difftime.c:(.text+0x8): undefined reference to `__floatsidf'
-difftime.c:(.text+0x2c): undefined reference to `__subdf3'
-libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
-_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
-_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
-_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
-_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
-_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
-_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
-_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
-libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
-__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
-libc/libc_so.a(strtof.os): In function `strtof':
-strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
-/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
-In function `__fixunsdfsi':
-libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
-make[2]: *** [lib/libc.so] Error 1
-make[1]: *** [lib/libc.so.0] Error 2
-make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
-make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
-Error 2
-
-The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
-
-
-diff -dur gcc-4.2.0.orig/gcc/config.gcc gcc-4.2.0/gcc/config.gcc
---- gcc-4.2.0.orig/gcc/config.gcc 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc 2007-07-15 11:26:02.000000000 +0200
-@@ -721,7 +721,7 @@
- default_use_cxa_atexit=yes
- ;;
- *)
-- tmake_file="$tmake_file arm/t-linux"
-+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
- ;;
- esac
- tm_file="$tm_file arm/aout.h arm/arm.h"
-diff -dur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-07-15 11:26:02.000000000 +0200
-@@ -63,7 +63,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.2.2/260-flatten-switch-stmt-00.patch b/patches/gcc/4.2.2/260-flatten-switch-stmt-00.patch
deleted file mode 100644
index 6c40c57..0000000
--- a/patches/gcc/4.2.2/260-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/stmt.c gcc-4.2.1/gcc/stmt.c
---- gcc-4.2.1.orig/gcc/stmt.c 2007-07-19 05:25:32.000000000 +0200
-+++ gcc-4.2.1/gcc/stmt.c 2007-08-03 20:37:19.000000000 +0200
-@@ -2512,7 +2512,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3070,6 +3074,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.2.2/270-soft-float.patch b/patches/gcc/4.2.2/270-soft-float.patch
deleted file mode 100644
index 4287bfa..0000000
--- a/patches/gcc/4.2.2/270-soft-float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
---- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c 2007-03-05 11:54:00.000000000 -0500
-+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c 2008-01-31 17:51:24.000000000 -0500
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
- but GCC currently generates poor code when a union is used to turn
- a long double into a pair of doubles. */
-
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
- return z.ldval;
- }
-
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);
diff --git a/patches/gcc/4.2.2/280-alpha-signal_h.patch b/patches/gcc/4.2.2/280-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.2.2/280-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.2.2/290-sh-without-headers.patch b/patches/gcc/4.2.2/290-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.2.2/290-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.2.2/300-avr32-atmel-v1.1.3.patch b/patches/gcc/4.2.2/300-avr32-atmel-v1.1.3.patch
deleted file mode 100644
index 7340a05..0000000
--- a/patches/gcc/4.2.2/300-avr32-atmel-v1.1.3.patch
+++ /dev/null
@@ -1,22620 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -503,6 +503,9 @@ case "${target}" in
- arm-*-riscix*)
- noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
- ;;
-+ avr32-*-*)
-+ noconfigdirs="$noconfigdirs target-libiberty target-libmudflap target-libffi ${libgcj}"
-+ ;;
- avr-*-*)
- noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
- ;;
---- a/gcc/builtins.c
-+++ b/gcc/builtins.c
-@@ -9223,7 +9223,7 @@ validate_arglist (tree arglist, ...)
-
- do
- {
-- code = va_arg (ap, enum tree_code);
-+ code = va_arg (ap, int);
- switch (code)
- {
- case 0:
---- a/gcc/calls.c
-+++ b/gcc/calls.c
-@@ -3447,7 +3447,7 @@ emit_library_call_value_1 (int retval, r
- 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. */
---- a/gcc/c-incpath.c
-+++ b/gcc/c-incpath.c
-@@ -347,6 +347,18 @@ add_path (char *path, int chain, int cxx
- char* c;
- for (c = path; *c; c++)
- if (*c == '\\') *c = '/';
-+ /* Remove unnecessary trailing slashes. On some versions of MS
-+ Windows, trailing _forward_ slashes cause no problems for stat().
-+ On newer versions, stat() does not recognise a directory that ends
-+ in a '\\' or '/', unless it is a drive root dir, such as "c:/",
-+ where it is obligatory. */
-+ int pathlen = strlen (path);
-+ char* end = path + pathlen - 1;
-+ /* Preserve the lead '/' or lead "c:/". */
-+ char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1);
-+
-+ for (; end > start && IS_DIR_SEPARATOR (*end); end--)
-+ *end = 0;
- #endif
-
- p = XNEW (cpp_dir);
---- /dev/null
-+++ b/gcc/config/avr32/avr32.c
-@@ -0,0 +1,7915 @@
-+/*
-+ Target hooks and helper functions for AVR32.
-+ Copyright 2003-2006 Atmel Corporation.
-+
-+ Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+ Initial porting by Anders �dland.
-+
-+ 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 "target.h"
-+#include "target-def.h"
-+
-+#include <ctype.h>
-+
-+/* Forward definitions of types. */
-+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;
-+
-+/* Some forward function declarations */
-+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_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__"},
-+ {"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__"},
-+ {"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__"},
-+ {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__=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;
-+
-+
-+/* 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 = 1;
-+}
-+
-+/* Override command line options */
-+void
-+avr32_override_options (void)
-+{
-+ const struct part_type_s *part;
-+ const struct arch_type_s *arch;
-+
-+ /*Add backward compability*/
-+ if (strcmp ("uc", avr32_arch_name)== 0)
-+ {
-+ fprintf (stderr, "Warning: Deprecated arch `%s' specified. "
-+ "Please use '-march=ucr1' instead. "
-+ "Converting to 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];
-+
-+ /* 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_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
-+
-+enum reg_class
-+avr32_secondary_reload (bool in_p, rtx x, enum reg_class class ATTRIBUTE_UNUSED,
-+ 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},
-+ {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_tree_hwi_hwi_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_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) \
-+ lang_hooks.builtin_function ((NAME), (TYPE), (CODE), \
-+ BUILT_IN_MD, NULL, NULL_TREE)
-+
-+#define def_mbuiltin(MASK, NAME, TYPE, CODE) \
-+ do \
-+ { \
-+ if ((MASK)) \
-+ lang_hooks.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 (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);
-+
-+ /* 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 arglist, rtx target)
-+{
-+ rtx pat;
-+ tree arg0 = TREE_VALUE (arglist);
-+ tree arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ rtx op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ rtx op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ 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 (TREE_OPERAND (exp, 0), 0);
-+ tree arglist = TREE_OPERAND (exp, 1);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
-+
-+ 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 = TREE_VALUE (arglist);
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ 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 = TREE_VALUE (arglist);
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
-+
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
-+
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ arg3 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (TREE_CHAIN (arglist))));
-+ arg4 =
-+ TREE_VALUE (TREE_CHAIN
-+ (TREE_CHAIN (TREE_CHAIN (TREE_CHAIN (arglist)))));
-+ op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+ op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
-+ op3 = expand_expr (arg3, NULL_RTX, VOIDmode, 0);
-+ op4 = expand_expr (arg4, NULL_RTX, VOIDmode, 0);
-+
-+ 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 = TREE_VALUE (arglist);
-+ arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+ 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;
-+ }
-+
-+ }
-+
-+ for (i = 0, d = bdesc_2arg; i < ARRAY_SIZE (bdesc_2arg); i++, d++)
-+ if (d->code == fcode)
-+ return avr32_expand_binop_builtin (d->icode, arglist, 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 ATTRIBUTE_UNUSED,
-+ 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;
-+}
-+
-+
-+/* 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;
-+}
-+
-+
-+/* 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)
-+{
-+ int acall1, acall2, isr1, isr2, naked1, naked2;
-+
-+ /* 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;
-+ 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))
-+ 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;
-+
-+ 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;
-+
-+/*
-+ 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)
-+{
-+ /* We allow only float modes in the fp-registers */
-+ if (regnr >= FIRST_FP_REGNUM
-+ && regnr <= LAST_FP_REGNUM && GET_MODE_CLASS (mode) != MODE_FLOAT)
-+ {
-+ return 0;
-+ }
-+
-+ 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
-+ {
-+ if (regnr % 2) /* long long int has to be refered in even
-+ registers. */
-+ 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 which floating-point registers needs saving upon
-+ entry to this function*/
-+static unsigned long
-+avr32_compute_save_fp_reg_mask (void)
-+{
-+ unsigned long func_type = avr32_current_func_type ();
-+ unsigned int save_reg_mask = 0;
-+ unsigned int reg;
-+ unsigned int max_reg = 7;
-+ int save_all_call_used_regs = FALSE;
-+
-+ /* This only applies for hardware floating-point implementation. */
-+ if (!TARGET_HARD_FLOAT)
-+ return 0;
-+
-+ if (IS_INTERRUPT (func_type))
-+ {
-+
-+ /* 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. */
-+ max_reg = 13;
-+ save_all_call_used_regs = !current_function_is_leaf;
-+ }
-+
-+ /* All used registers used must be saved */
-+ for (reg = 0; reg <= max_reg; reg++)
-+ if (regs_ever_live[INTERNAL_FP_REGNUM (reg)]
-+ || (save_all_call_used_regs
-+ && call_used_regs[INTERNAL_FP_REGNUM (reg)]))
-+ save_reg_mask |= (1 << reg);
-+
-+ return save_reg_mask;
-+}
-+
-+/*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 is not shadowed must be saved */
-+ for (reg = 0; reg <= max_reg; reg++)
-+ if (regs_ever_live[INTERNAL_REGNUM (reg)]
-+ || (!current_function_is_leaf
-+ && call_used_regs[INTERNAL_REGNUM (reg)]))
-+ save_reg_mask |= (1 << reg);
-+
-+ /* Check LR */
-+ if ((regs_ever_live[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)
-+ && current_function_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 (regs_ever_live[INTERNAL_REGNUM (reg)]
-+ && !call_used_regs[INTERNAL_REGNUM (reg)])
-+ save_reg_mask |= (1 << reg);
-+
-+ /* Make sure that the GOT register is pushed. */
-+ if (current_function_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
-+ popm/pushm 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 ((regs_ever_live[LR_REGNUM]
-+ || !current_function_is_leaf
-+ || (optimize_size
-+ && save_reg_mask
-+ && !current_function_calls_eh_return) || frame_pointer_needed))
-+ {
-+ 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. */
-+ || current_function_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 (current_function_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;
-+ unsigned long saved_fp_regs;
-+
-+ /* Never use a return instruction before reload has run. */
-+ if (!reload_completed)
-+ return 0;
-+
-+ /* Must adjust the stack for vararg functions. */
-+ if (current_function_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);
-+ saved_fp_regs = avr32_compute_save_fp_reg_mask ();
-+
-+ /* Functions which have saved fp-regs on the stack can not be performed in
-+ one instruction */
-+ if (saved_fp_regs)
-+ return 0;
-+
-+ /* 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)
-+{
-+ if (IS_NAKED (avr32_current_func_type ()))
-+ fprintf (f,
-+ "\t# Function is naked: Prologue and epilogue provided by programmer\n");
-+
-+ if (IS_INTERRUPT (avr32_current_func_type ()))
-+ {
-+ switch (avr32_current_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",
-+ current_function_args_size, frame_size,
-+ current_function_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",
-+ current_function_args_info.uses_anonymous_args);
-+ if (current_function_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;
-+}
-+
-+
-+static rtx
-+emit_multi_fp_reg_push (int reglist)
-+{
-+ rtx insn;
-+ rtx dwarf;
-+ rtx tmp;
-+ rtx reg;
-+ int i;
-+ int nr_regs;
-+ int index = 0;
-+
-+ insn = emit_insn (gen_stm_fp (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_FP_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, saved_fp_reg_mask;
-+ int reglist8 = 0;
-+
-+ /* Naked functions does 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)))
-+ {
-+ /* 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 ());
-+ }
-+
-+ saved_fp_reg_mask = avr32_compute_save_fp_reg_mask ();
-+ if (saved_fp_reg_mask)
-+ {
-+ insn = emit_multi_fp_reg_push (saved_fp_reg_mask);
-+ 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, saved_fp_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_fp_reg_mask = avr32_compute_save_fp_reg_mask ();
-+
-+ 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_fp_reg_mask)
-+ {
-+ char reglist[64]; /* 64 bytes should be enough... */
-+ avr32_make_fp_reglist_w (saved_fp_reg_mask, (char *) reglist);
-+ fprintf (f, "\tldcm.w\tcp0, sp++, %s\n", reglist);
-+ if (saved_fp_reg_mask & ~0xff)
-+ {
-+ saved_fp_reg_mask &= ~0xff;
-+ avr32_make_fp_reglist_d (saved_fp_reg_mask, (char *) reglist);
-+ fprintf (f, "\tldcm.d\tcp0, sp++, %s\n", reglist);
-+ }
-+ }
-+
-+ 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)))
-+ /* 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 (current_function_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 (insert_ret)
-+ {
-+ if (r12_imm)
-+ fprintf (f, "\tretal\t%li\n", INTVAL (r12_imm));
-+ else
-+ fprintf (f, "\tretal\tr12\n");
-+ }
-+}
-+
-+/* Function for converting a fp-register mask to a
-+ reglistCPD8 register list string. */
-+void
-+avr32_make_fp_reglist_d (int reglist_mask, char *reglist_string)
-+{
-+ int i;
-+
-+ /* Make sure reglist_string is empty */
-+ reglist_string[0] = '\0';
-+
-+ for (i = 0; i < NUM_FP_REGS; i += 2)
-+ {
-+ if (reglist_mask & (1 << i))
-+ {
-+ strlen (reglist_string) ?
-+ sprintf (reglist_string, "%s, %s-%s", reglist_string,
-+ reg_names[INTERNAL_FP_REGNUM (i)],
-+ reg_names[INTERNAL_FP_REGNUM (i + 1)]) :
-+ sprintf (reglist_string, "%s-%s",
-+ reg_names[INTERNAL_FP_REGNUM (i)],
-+ reg_names[INTERNAL_FP_REGNUM (i + 1)]);
-+ }
-+ }
-+}
-+
-+/* Function for converting a fp-register mask to a
-+ reglistCP8 register list string. */
-+void
-+avr32_make_fp_reglist_w (int reglist_mask, char *reglist_string)
-+{
-+ int i;
-+
-+ /* Make sure reglist_string is empty */
-+ reglist_string[0] = '\0';
-+
-+ for (i = 0; i < NUM_FP_REGS; ++i)
-+ {
-+ if (reglist_mask & (1 << i))
-+ {
-+ strlen (reglist_string) ?
-+ sprintf (reglist_string, "%s, %s", reglist_string,
-+ reg_names[INTERNAL_FP_REGNUM (i)]) :
-+ sprintf (reglist_string, "%s", reg_names[INTERNAL_FP_REGNUM (i)]);
-+ }
-+ }
-+}
-+
-+void
-+avr32_make_reglist16 (int reglist16_vect, char *reglist16_string)
-+{
-+ int i;
-+
-+ /* Make sure reglist16_string is empty */
-+ reglist16_string[0] = '\0';
-+
-+ for (i = 0; i < 16; ++i)
-+ {
-+ if (reglist16_vect & (1 << i))
-+ {
-+ strlen (reglist16_string) ?
-+ sprintf (reglist16_string, "%s, %s", reglist16_string,
-+ reg_names[INTERNAL_REGNUM (i)]) :
-+ sprintf (reglist16_string, "%s", 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)
-+ sprintf (reglist8_string, "r0-r3");
-+ if (reglist8_vect & 0x2)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, r4-r7",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "r4-r7");
-+ if (reglist8_vect & 0x4)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, r8-r9",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "r8-r9");
-+ if (reglist8_vect & 0x8)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, r10",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "r10");
-+ if (reglist8_vect & 0x10)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, r11",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "r11");
-+ if (reglist8_vect & 0x20)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, r12",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "r12");
-+ if (reglist8_vect & 0x40)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, lr",
-+ reglist8_string) :
-+ sprintf (reglist8_string, "lr");
-+ if (reglist8_vect & 0x80)
-+ strlen (reglist8_string) ? sprintf (reglist8_string, "%s, pc",
-+ reglist8_string) :
-+ sprintf (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, saved_fp_reg_mask;
-+ unsigned int local_vars = get_frame_size ();
-+
-+ saved_reg_mask = avr32_compute_save_reg_mask (TRUE);
-+ saved_fp_reg_mask = avr32_compute_save_fp_reg_mask ();
-+
-+ for (i = 0; i < 16; ++i)
-+ {
-+ if (saved_reg_mask & (1 << i))
-+ call_saved_regs += 4;
-+ }
-+
-+ for (i = 0; i < NUM_FP_REGS; ++i)
-+ {
-+ if (saved_fp_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 witch
-+ register to use.
-+*/
-+rtx
-+avr32_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
-+ tree type, int named)
-+{
-+ int index = -1;
-+
-+ 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 (!(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_CUM_REG_INDEX && GET_USED_INDEX (cum, index))
-+ index++;
-+ if (index > LAST_CUM_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 ATTRIBUTE_UNUSED)
-+ {
-+ /* 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;
-+ }
-+
-+/*
-+ 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);
-+
-+ /* It 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)
-+ if (avr32_return_in_msb (type))
-+ /* Aggregates of size less than a word which does align the data in the
-+ MSB must use SImode for r12. */
-+ return gen_rtx_REG (SImode, RET_REGISTER);
-+ else
-+ return gen_rtx_REG (TYPE_MODE (type), 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 (no_new_pseudos)
-+ 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)
-+ current_function_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 (no_new_pseudos)
-+ 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 (!no_new_pseudos)
-+ 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 ((current_function_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)
-+ {
-+ if (TARGET_HARD_FLOAT && GET_MODE_CLASS (mode) == MODE_FLOAT)
-+ /* Coprocessor mem insns has a smaller reach than ordinary mem insns */
-+ return CONST_OK_FOR_CONSTRAINT_P (INTVAL (index), 'K', "Ku14");
-+ else
-+ 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)
-+ && CONST_OK_FOR_CONSTRAINT_P(INTVAL(x), 'K', "Ks17"));
-+ case CONST:
-+ {
-+ rtx label = avr32_find_symbol (x);
-+ if (label
-+ &&
-+ ((CONSTANT_POOL_ADDRESS_P (label)
-+ && !(flag_pic
-+ && (symbol_mentioned_p (get_pool_constant (label))
-+ || label_mentioned_p (get_pool_constant (label)))))
-+ /* TODO! Can this ever happen??? */
-+ || ((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;
-+ 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;
-+ FPCC_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 (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_FPCOMPARE:
-+ /* Check that floating-point compare will not be optimized away if so
-+ nothing should be done */
-+ if (!rtx_equal_p (cc_prev_status.mdep.fpvalue, SET_SRC (exp)))
-+ {
-+ /* cc0 already contains the correct comparison -> delete cmp insn */
-+ /* Reset the nonstandard flag */
-+ cc_status.mdep.fpvalue = SET_SRC (exp);
-+ cc_status.mdep.fpflags = CC_SET_CZ;
-+ }
-+ break;
-+ case CC_FROM_FPCC:
-+ /* Flags are updated with flags from Floating-point coprocessor, set
-+ CC_NOT_SIGNED flag since the flags are set so that unsigned
-+ condidion codes can be used directly. */
-+ CC_STATUS_INIT;
-+ cc_status.flags = CC_NOT_SIGNED;
-+ cc_status.mdep.value = cc_status.mdep.fpvalue;
-+ cc_status.mdep.flags = cc_status.mdep.fpflags;
-+ 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)
-+ sprintf (op, "r0-r3");
-+ if (value & 0x02)
-+ strlen (op) ? sprintf (op, "%s, r4-r7", op) : sprintf (op,
-+ "r4-r7");
-+ if (value & 0x04)
-+ strlen (op) ? sprintf (op, "%s, r8-r9", op) : sprintf (op,
-+ "r8-r9");
-+ if (value & 0x08)
-+ strlen (op) ? sprintf (op, "%s, r10", op) : sprintf (op,
-+ "r10");
-+ if (value & 0x10)
-+ strlen (op) ? sprintf (op, "%s, r11", op) : sprintf (op,
-+ "r11");
-+ if (value & 0x20)
-+ strlen (op) ? sprintf (op, "%s, r12", op) : sprintf (op,
-+ "r12");
-+ if (value & 0x40)
-+ strlen (op) ? sprintf (op, "%s, lr", op) : sprintf (op, "lr");
-+ if (value & 0x80)
-+ strlen (op) ? sprintf (op, "%s, pc", op) : sprintf (op, "pc");
-+
-+ fputs (op, stream);
-+ return;
-+ }
-+ case 's':
-+ {
-+ /* Reglist 16 */
-+ char reglist16_string[100];
-+ int i;
-+ reglist16_string[0] = '\0';
-+
-+ for (i = 0; i < 16; ++i)
-+ {
-+ if (value & (1 << i))
-+ {
-+ strlen (reglist16_string) ? sprintf (reglist16_string,
-+ "%s, %s",
-+ reglist16_string,
-+ reg_names
-+ [INTERNAL_REGNUM
-+ (i)]) :
-+ sprintf (reglist16_string, "%s",
-+ reg_names[INTERNAL_REGNUM (i)]);
-+ }
-+ }
-+ fputs (reglist16_string, stream);
-+ return;
-+ }
-+ case 'C':
-+ {
-+ /* RegListCP8 */
-+ char reglist_string[100];
-+ avr32_make_fp_reglist_w (value, (char *) reglist_string);
-+ fputs (reglist_string, stream);
-+ return;
-+ }
-+ case 'D':
-+ {
-+ /* RegListCPD8 */
-+ char reglist_string[100];
-+ avr32_make_fp_reglist_d (value, (char *) reglist_string);
-+ fputs (reglist_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)
-+ {
-+ /* Word Load */
-+ if (TARGET_HARD_FLOAT
-+ && GET_MODE_CLASS (GET_MODE (SET_DEST (body))) == MODE_FLOAT)
-+ {
-+ /* Ldc0.w : Ku12 << 2 */
-+ fix->forwards = ((1 << 12) - 1) << 2;
-+ fix->backwards = 0;
-+ }
-+ else
-+ {
-+ 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)
-+ {
-+ /* Double word load */
-+ if (TARGET_HARD_FLOAT
-+ && GET_MODE_CLASS (GET_MODE (SET_DEST (body))) == MODE_FLOAT)
-+ {
-+ /* Ldc0.d : Ku12 << 2 */
-+ fix->forwards = ((1 << 12) - 1) << 2;
-+ fix->backwards = 0;
-+ }
-+ else
-+ {
-+ /* 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 (link = LOG_LINKS (insn); link; link = XEXP (link, 1))
-+ {
-+ if (REG_NOTE_KIND (link) != 0)
-+ continue;
-+ set = single_set (XEXP (link, 0));
-+ if (set && rtx_equal_p (src_reg, SET_DEST (set)))
-+ {
-+ link = XEXP (link, 0);
-+ 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;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ if (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;
-+}
-+
-+
-+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 );
-+
-+ 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
-+ && !no_new_pseudos )
-+ {
-+ /* 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]))
-+ && (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");
-+ }
-+}
---- /dev/null
-+++ b/gcc/config/avr32/avr32-elf.h
-@@ -0,0 +1,84 @@
-+/*
-+ Elf specific definitions.
-+ 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. */
-+
-+
-+/*****************************************************************************
-+ * Controlling the Compilator 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.
-+*/
-+#undef STARTFILE_SPEC
-+#define STARTFILE_SPEC "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__"); \
-+ } \
-+ while (0)
---- /dev/null
-+++ b/gcc/config/avr32/avr32.h
-@@ -0,0 +1,3347 @@
-+/*
-+ Definitions of target machine for AVR32.
-+ Copyright 2003-2006 Atmel Corporation.
-+
-+ Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+ Initial porting by Anders �dland.
-+
-+ 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;
-+
-+
-+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. ie a function cannot be both a
-+ normal function and an interworked function, for example. 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 /* Your normal, straightforward
-+ 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. */
-+
-+/* 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_VOLATILE(t) (t & AVR32_FT_VOLATILE)
-+#define IS_NAKED(t) (t & AVR32_FT_NAKED)
-+#define IS_NESTED(t) (t & AVR32_FT_NESTED)
-+
-+#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_UC3B064,
-+ PART_TYPE_AVR32_UC3B0128,
-+ PART_TYPE_AVR32_UC3B0256,
-+ PART_TYPE_AVR32_UC3B0256ES,
-+ PART_TYPE_AVR32_UC3B164,
-+ PART_TYPE_AVR32_UC3B1128,
-+ PART_TYPE_AVR32_UC3B1256,
-+ PART_TYPE_AVR32_UC3B1256ES
-+};
-+
-+/* 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_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)
-+
-+/* 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 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 (GET_MODE_CLASS (M) == MODE_INT \
-+ && GET_MODE_SIZE (M) < 4) \
-+ { \
-+ if (M == QImode) \
-+ UNSIGNEDP = 1; \
-+ else if (M == SImode) \
-+ UNSIGNEDP = 0; \
-+ (M) = SImode; \
-+ } \
-+ }
-+
-+#define PROMOTE_FUNCTION_MODE(M, UNSIGNEDP, TYPE) \
-+ { \
-+ if (GET_MODE_CLASS (M) == MODE_INT \
-+ && GET_MODE_SIZE (M) < 4) \
-+ { \
-+ (M) = SImode; \
-+ } \
-+ }
-+
-+/* 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)
-+
-+
-+/*
-+Define this macro if the promotion described by PROMOTE_MODE
-+should only be performed for outgoing function arguments or
-+function return values, as specified by PROMOTE_FUNCTION_ARGS
-+and PROMOTE_FUNCTION_RETURN, respectively.
-+*/
-+/* #define PROMOTE_FOR_CALL_ONLY */
-+
-+/*
-+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))
-+#define ASM_FP_REGNUM(reg) (LAST_FP_REGNUM - (reg))
-+
-+/* Convert between register number used in assembly to gcc
-+ internal register number */
-+#define INTERNAL_REGNUM(reg) (LAST_REGNUM - (reg))
-+#define INTERNAL_FP_REGNUM(reg) (LAST_FP_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_FP_REGNUM + 1)
-+
-+#define FIRST_REGNUM 0
-+#define LAST_REGNUM 15
-+#define NUM_FP_REGS 16
-+#define FIRST_FP_REGNUM 16
-+#define LAST_FP_REGNUM (16+NUM_FP_REGS-1)
-+
-+/*
-+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 */ \
-+ 0, /* f15 */ \
-+ 0, /* f14 */ \
-+ 0, /* f13 */ \
-+ 0, /* f12 */ \
-+ 0, /* f11 */ \
-+ 0, /* f10 */ \
-+ 0, /* f9 */ \
-+ 0, /* f8 */ \
-+ 0, /* f7 */ \
-+ 0, /* f6 */ \
-+ 0, /* f5 */ \
-+ 0, /* f4 */ \
-+ 0, /* f3 */ \
-+ 0, /* f2*/ \
-+ 0, /* f1 */ \
-+ 0 /* f0 */ \
-+}
-+
-+/*
-+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 */ \
-+ 1, /* f15 */ \
-+ 1, /* f14 */ \
-+ 1, /* f13 */ \
-+ 1, /* f12 */ \
-+ 1, /* f11 */ \
-+ 1, /* f10 */ \
-+ 1, /* f9 */ \
-+ 1, /* f8 */ \
-+ 0, /* f7 */ \
-+ 0, /* f6 */ \
-+ 0, /* f5 */ \
-+ 0, /* f4 */ \
-+ 0, /* f3 */ \
-+ 0, /* f2*/ \
-+ 0, /* f1*/ \
-+ 0, /* f0 */ \
-+}
-+
-+/* 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) || \
-+ regs_ever_live[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 \
-+ { \
-+ int regno; \
-+ \
-+ if (TARGET_SOFT_FLOAT) \
-+ { \
-+ for (regno = FIRST_FP_REGNUM; \
-+ regno <= LAST_FP_REGNUM; ++regno) \
-+ fixed_regs[regno] = call_used_regs[regno] = 1; \
-+ } \
-+ 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), \
-+ INTERNAL_FP_REGNUM(15), \
-+ INTERNAL_FP_REGNUM(14), \
-+ INTERNAL_FP_REGNUM(13), \
-+ INTERNAL_FP_REGNUM(12), \
-+ INTERNAL_FP_REGNUM(11), \
-+ INTERNAL_FP_REGNUM(10), \
-+ INTERNAL_FP_REGNUM(9), \
-+ INTERNAL_FP_REGNUM(8), \
-+ INTERNAL_FP_REGNUM(7), \
-+ INTERNAL_FP_REGNUM(6), \
-+ INTERNAL_FP_REGNUM(5), \
-+ INTERNAL_FP_REGNUM(4), \
-+ INTERNAL_FP_REGNUM(3), \
-+ INTERNAL_FP_REGNUM(2), \
-+ INTERNAL_FP_REGNUM(1), \
-+ INTERNAL_FP_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,
-+ FP_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", \
-+ "FLOATING_POINT_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 */ \
-+ {0xFFFF0000}, /* FP_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) ((REGNO < 16) ? GENERAL_REGS : FP_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) ((CHAR) == 'f' ? FP_REGS : 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)
-+
-+/*
-+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 (current_function_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 arguemnt */
-+ 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;
-+
-+} 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 fpflags;
-+ rtx fpvalue;
-+ 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)
-+
-+#define FPCC_STATUS_INIT \
-+ (cc_status.mdep.fpflags = CC_NONE , cc_status.mdep.fpvalue = 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 (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
-+used as a logical line separator by the assembler.
-+
-+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) ((C) == '\n')
-+
-+
-+/** 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.globl\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", \
-+ "f15","f14", \
-+ "f13","f12", \
-+ "f11","f10", \
-+ "f9", "f8", \
-+ "f7", "f6", \
-+ "f5", "f4", \
-+ "f3", "f2", \
-+ "f1", "f0" \
-+}
-+
-+/*
-+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 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
-+};
-+
-+
-+#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
---- /dev/null
-+++ b/gcc/config/avr32/avr32.md
-@@ -0,0 +1,4893 @@
-+;; AVR32 machine description 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.
-+
-+;; -*- 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"
-+ (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_FPCC_TO_REG 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)
-+ ])
-+
-+(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_macro INTM [SI HI QI])
-+(define_mode_attr alu_cc_attr [(SI "set_vncz") (HI "clobber") (QI "clobber")])
-+
-+;; Move word modes
-+(define_mode_macro MOVM [SI V2HI V4QI])
-+
-+;; For mov/addcc insns
-+(define_mode_macro ADDCC [SI HI QI])
-+(define_mode_macro MOVCC [SF SI HI QI])
-+(define_mode_macro 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_macro any_cond [eq ne gt ge lt le gtu geu ltu 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_macro logical [and ior xor])
-+(define_code_attr logical_insn [(and "and") (ior "or") (xor "eor")])
-+
-+;; Predicable operations with three register operands
-+(define_code_macro 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 ( !no_new_pseudos ){
-+ 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 ( !no_new_pseudos ){
-+ 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,
-+ (no_new_pseudos ? operands[0] : 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. */
-+ current_function_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"))]
-+ "TARGET_SOFT_FLOAT
-+ && (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();
-+ }
-+ }
-+ "TARGET_SOFT_FLOAT
-+ && 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 "nonmemory_operand" "0,r,0,r,0,r,Ks08")
-+ (match_operand:INTM 2 "nonmemory_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 (! no_new_pseudos) {
-+ 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 (! no_new_pseudos) {
-+ 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 "nonmemory_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 "nonmemory_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 "nonmemory_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>")))]
-+ ""
-+ {
-+ 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")])
-+
-+
-+;;;=============================================================================
-+;; 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"))]
-+ ""
-+ {
-+ 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"))]
-+ ""
-+ {
-+ 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_insn "s<code>"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (any_cond:SI (cc0)
-+ (const_int 0)))]
-+ ""
-+ "sr<cond>\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:CC (cc0)
-+ (const_int 0))
-+ (label_ref (match_operand 0 "" ""))
-+ (pc)))]
-+ ""
-+ "br<cond> %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_cond:CC (cc0)
-+ (const_int 0))
-+ (pc)
-+ (label_ref (match_operand 0 "" ""))))]
-+ ""
-+ "br<invcond> %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")])
-+
-+
-+
-+;=============================================================================
-+; 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))])]
-+ ""
-+ {
-+ 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 ){
-+ current_function_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 ){
-+ current_function_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
-+;;-----------------------------------------------------------------------------
-+;; Subrutine 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);
-+
-+ /* 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 ) {
-+ current_function_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 ){
-+ current_function_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.
-+ ""
-+ {
-+ 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")])
-+
-+;;=============================================================================
-+;; nop
-+;;-----------------------------------------------------------------------------
-+;; No-op instruction.
-+;;=============================================================================
-+(define_insn "nop"
-+ [(const_int 0)]
-+ ""
-+ "nop"
-+ [(set_attr "length" "2")
-+ (set_attr "type" "alu")
-+ (set_attr "cc" "none")])
-+
-+;;=============================================================================
-+;; 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. */
-+ current_function_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")]
-+ )
-+
-+;; 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")
-+
-+;; Load the FP coprAocessor patterns
-+(include "fpcp.md")
---- /dev/null
-+++ b/gcc/config/avr32/avr32-modes.def
-@@ -0,0 +1 @@
-+VECTOR_MODES (INT, 4); /* V4QI V2HI */
---- /dev/null
-+++ b/gcc/config/avr32/avr32.opt
-@@ -0,0 +1,86 @@
-+; 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 Undocumented Mask(HARD_FLOAT)
-+Use floating point coprocessor instructions.
-+
-+msoft-float
-+Target Report Undocumented InverseMask(HARD_FLOAT, SOFT_FLOAT)
-+Use software floating-point library 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.
-+
---- /dev/null
-+++ b/gcc/config/avr32/avr32-protos.h
-@@ -0,0 +1,196 @@
-+/*
-+ Prototypes for exported functions defined in avr32.c
-+ Copyright 2003-2006 Atmel Corporation.
-+
-+ Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+ Initial porting by Anders �dland.
-+
-+ 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);
-+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[]);
-+
-+
-+#endif /* AVR32_PROTOS_H */
---- /dev/null
-+++ b/gcc/config/avr32/crti.asm
-@@ -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:
-+
---- /dev/null
-+++ b/gcc/config/avr32/crtn.asm
-@@ -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
-+
---- /dev/null
-+++ b/gcc/config/avr32/fpcp.md
-@@ -0,0 +1,551 @@
-+;; AVR32 machine description file for Floating-Point 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 -*-
-+
-+;;******************************************************************************
-+;; Automaton pipeline description for floating-point coprocessor insns
-+;;******************************************************************************
-+(define_cpu_unit "fid,fm1,fm2,fm3,fm4,fwb,fcmp,fcast" "avr32_ap")
-+
-+(define_insn_reservation "fmv_op" 1
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fmv"))
-+ "is,da,d,fid,fwb")
-+
-+(define_insn_reservation "fmul_op" 5
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fmul"))
-+ "is,da,d,fid,fm1,fm2,fm3,fm4,fwb")
-+
-+(define_insn_reservation "fcmps_op" 1
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fcmps"))
-+ "is,da,d,fid,fcmp")
-+
-+(define_insn_reservation "fcmpd_op" 2
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fcmpd"))
-+ "is,da,d,fid*2,fcmp")
-+
-+(define_insn_reservation "fcast_op" 3
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fcast"))
-+ "is,da,d,fid,fcmp,fcast,fwb")
-+
-+(define_insn_reservation "fmvcpu_op" 2
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fmvcpu"))
-+ "is,da,d")
-+
-+(define_insn_reservation "fldd_op" 1
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fldd"))
-+ "is,da,d,fwb")
-+
-+(define_insn_reservation "flds_op" 1
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "flds"))
-+ "is,da,d,fwb")
-+
-+(define_insn_reservation "fsts_op" 0
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fsts"))
-+ "is,da*2,d")
-+
-+(define_insn_reservation "fstd_op" 0
-+ (and (eq_attr "pipeline" "ap")
-+ (eq_attr "type" "fstd"))
-+ "is,da*2,d")
-+
-+
-+(define_insn "*movsf_fpcp"
-+ [(set (match_operand:SF 0 "nonimmediate_operand" "=f,f,r,f,m,r,r,r,m")
-+ (match_operand:SF 1 "general_operand" " f,r,f,m,f,r,G,m,r"))]
-+ "TARGET_HARD_FLOAT"
-+ "@
-+ fmov.s\t%0, %1
-+ fmov.s\t%0, %1
-+ fmov.s\t%0, %1
-+ fld.s\t%0, %1
-+ fst.s\t%0, %1
-+ mov\t%0, %1
-+ mov\t%0, %1
-+ ld.w\t%0, %1
-+ st.w\t%0, %1"
-+ [(set_attr "length" "4,4,4,4,4,2,4,4,4")
-+ (set_attr "type" "fmv,flds,fmvcpu,flds,fsts,alu,alu,load,store")])
-+
-+(define_insn_and_split "*movdf_fpcp"
-+ [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,r,f,m,r,r,m")
-+ (match_operand:DF 1 "general_operand" " f,r,f,m,f,r,m,r"))]
-+ "TARGET_HARD_FLOAT"
-+ "@
-+ fmov.d\t%0, %1
-+ fmov.d\t%0, %1
-+ fmov.d\t%0, %1
-+ fld.d\t%0, %1
-+ fst.d\t%0, %1
-+ mov\t%0, %1\;mov\t%m0, %m1
-+ ld.d\t%0, %1
-+ st.d\t%0, %1"
-+
-+ "TARGET_HARD_FLOAT
-+ && reload_completed
-+ && (REG_P(operands[0]) && (REGNO_REG_CLASS(REGNO(operands[0])) == GENERAL_REGS))
-+ && (REG_P(operands[1]) && (REGNO_REG_CLASS(REGNO(operands[1])) == GENERAL_REGS))"
-+ [(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,4,4,4,4,4,4")
-+ (set_attr "type" "fmv,fldd,fmvcpu,fldd,fstd,alu2,load2,store2")])
-+
-+
-+(define_insn "mulsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f")))]
-+ "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 "avr32_fp_register_operand" "=f")
-+ (neg:SF (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f"))))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmul.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "")
-+ (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:SF 3 "avr32_fp_register_operand" "")
-+ (neg:SF (match_dup 0)))]
-+ "TARGET_HARD_FLOAT &&
-+ (peep2_reg_dead_p(2, operands[0]) || (REGNO(operands[3]) == REGNO(operands[0])))"
-+ [(set (match_dup 3)
-+ (neg:SF (mult:SF (match_dup 1)
-+ (match_dup 2))))]
-+)
-+
-+
-+(define_insn "macsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (plus:SF (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f"))
-+ (match_operand:SF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fmac.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "nmacsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (plus:SF (neg:SF (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f")))
-+ (match_operand:SF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmac.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "")
-+ (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:SF 3 "avr32_fp_register_operand" "")
-+ (minus:SF
-+ (match_dup 3)
-+ (match_dup 0)))]
-+ "TARGET_HARD_FLOAT && peep2_reg_dead_p(2, operands[0])"
-+ [(set (match_dup 3)
-+ (plus:SF (neg:SF (mult:SF (match_dup 1)
-+ (match_dup 2)))
-+ (match_dup 3)))]
-+)
-+
-+
-+(define_insn "msubacsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (minus:SF (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f"))
-+ (match_operand:SF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fmsc.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "")
-+ (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:SF 3 "avr32_fp_register_operand" "")
-+ (minus:SF
-+ (match_dup 0)
-+ (match_dup 3)))]
-+ "TARGET_HARD_FLOAT && peep2_reg_dead_p(2, operands[0])"
-+ [(set (match_dup 3)
-+ (minus:SF (mult:SF (match_dup 1)
-+ (match_dup 2))
-+ (match_dup 3)))]
-+)
-+
-+(define_insn "nmsubacsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (minus:SF (neg:SF (mult:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f")))
-+ (match_operand:SF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmsc.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+
-+
-+(define_insn "addsf3"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (plus:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f")))]
-+ "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 "avr32_fp_register_operand" "=f")
-+ (minus:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 2 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fsub.s\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+
-+(define_insn "negsf2"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (neg:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fneg.s\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmv")])
-+
-+(define_insn "abssf2"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (abs:SF (match_operand:SF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fabs.s\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmv")])
-+
-+(define_insn "truncdfsf2"
-+ [(set (match_operand:SF 0 "avr32_fp_register_operand" "=f")
-+ (float_truncate:SF
-+ (match_operand:DF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fcastd.s\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fcast")])
-+
-+(define_insn "extendsfdf2"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (float_extend:DF
-+ (match_operand:SF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fcasts.d\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fcast")])
-+
-+(define_insn "muldf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fmul.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "nmuldf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (neg:DF (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f"))))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmul.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "")
-+ (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:DF 3 "avr32_fp_register_operand" "")
-+ (neg:DF (match_dup 0)))]
-+ "TARGET_HARD_FLOAT &&
-+ (peep2_reg_dead_p(2, operands[0]) || (REGNO(operands[3]) == REGNO(operands[0])))"
-+ [(set (match_dup 3)
-+ (neg:DF (mult:DF (match_dup 1)
-+ (match_dup 2))))]
-+)
-+
-+(define_insn "macdf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (plus:DF (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f"))
-+ (match_operand:DF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fmac.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "msubacdf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (minus:DF (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f"))
-+ (match_operand:DF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fmsc.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "")
-+ (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:DF 3 "avr32_fp_register_operand" "")
-+ (minus:DF
-+ (match_dup 0)
-+ (match_dup 3)))]
-+ "TARGET_HARD_FLOAT && peep2_reg_dead_p(2, operands[0])"
-+ [(set (match_dup 3)
-+ (minus:DF (mult:DF (match_dup 1)
-+ (match_dup 2))
-+ (match_dup 3)))]
-+ )
-+
-+(define_insn "nmsubacdf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (minus:DF (neg:DF (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f")))
-+ (match_operand:DF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmsc.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "nmacdf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (plus:DF (neg:DF (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f")))
-+ (match_operand:DF 3 "avr32_fp_register_operand" "0")))]
-+ "TARGET_HARD_FLOAT"
-+ "fnmac.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_peephole2
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "")
-+ (mult:DF (match_operand:DF 1 "avr32_fp_register_operand" "")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "")))
-+ (set (match_operand:DF 3 "avr32_fp_register_operand" "")
-+ (minus:DF
-+ (match_dup 3)
-+ (match_dup 0)))]
-+ "TARGET_HARD_FLOAT && peep2_reg_dead_p(2, operands[0])"
-+ [(set (match_dup 3)
-+ (plus:DF (neg:DF (mult:DF (match_dup 1)
-+ (match_dup 2)))
-+ (match_dup 3)))]
-+)
-+
-+(define_insn "adddf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (plus:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fadd.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "subdf3"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (minus:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 2 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fsub.d\t%0, %1, %2"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmul")])
-+
-+(define_insn "negdf2"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (neg:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fneg.d\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmv")])
-+
-+(define_insn "absdf2"
-+ [(set (match_operand:DF 0 "avr32_fp_register_operand" "=f")
-+ (abs:DF (match_operand:DF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ "fabs.d\t%0, %1"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmv")])
-+
-+
-+(define_expand "cmpdf"
-+ [(set (cc0)
-+ (compare:DF
-+ (match_operand:DF 0 "general_operand" "")
-+ (match_operand:DF 1 "general_operand" "")))]
-+ "TARGET_HARD_FLOAT"
-+ "{
-+ rtx tmpreg;
-+ if ( !REG_P(operands[0]) )
-+ operands[0] = force_reg(DFmode, operands[0]);
-+
-+ if ( !REG_P(operands[1]) )
-+ operands[1] = force_reg(DFmode, operands[1]);
-+
-+ avr32_compare_op0 = operands[0];
-+ avr32_compare_op1 = operands[1];
-+
-+ emit_insn(gen_cmpdf_internal(operands[0], operands[1]));
-+
-+ tmpreg = gen_reg_rtx(SImode);
-+ emit_insn(gen_fpcc_to_reg(tmpreg));
-+ emit_insn(gen_reg_to_cc(tmpreg));
-+
-+ DONE;
-+ }"
-+)
-+
-+(define_insn "cmpdf_internal"
-+ [(set (reg:CC FPCC_REGNUM)
-+ (compare:CC
-+ (match_operand:DF 0 "avr32_fp_register_operand" "f")
-+ (match_operand:DF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ {
-+ if (!rtx_equal_p(cc_prev_status.mdep.fpvalue, SET_SRC(PATTERN (insn))) )
-+ return "fcmp.d\t%0, %1";
-+ return "";
-+ }
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fcmpd")
-+ (set_attr "cc" "fpcompare")])
-+
-+(define_expand "cmpsf"
-+ [(set (cc0)
-+ (compare:SF
-+ (match_operand:SF 0 "general_operand" "")
-+ (match_operand:SF 1 "general_operand" "")))]
-+ "TARGET_HARD_FLOAT"
-+ "{
-+ rtx tmpreg;
-+ 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(operands[0], operands[1]));
-+
-+ tmpreg = gen_reg_rtx(SImode);
-+ emit_insn(gen_fpcc_to_reg(tmpreg));
-+ emit_insn(gen_reg_to_cc(tmpreg));
-+
-+ DONE;
-+ }"
-+)
-+
-+(define_insn "cmpsf_internal"
-+ [(set (reg:CC FPCC_REGNUM)
-+ (compare:CC
-+ (match_operand:SF 0 "avr32_fp_register_operand" "f")
-+ (match_operand:SF 1 "avr32_fp_register_operand" "f")))]
-+ "TARGET_HARD_FLOAT"
-+ {
-+ if (!rtx_equal_p(cc_prev_status.mdep.fpvalue, SET_SRC(PATTERN (insn))) )
-+ return "fcmp.s\t%0, %1";
-+ return "";
-+ }
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fcmps")
-+ (set_attr "cc" "fpcompare")])
-+
-+(define_insn "fpcc_to_reg"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec:SI [(reg:CC FPCC_REGNUM)]
-+ UNSPEC_FPCC_TO_REG))]
-+ "TARGET_HARD_FLOAT"
-+ "fmov.s\t%0, fsr"
-+ [(set_attr "length" "4")
-+ (set_attr "type" "fmvcpu")])
-+
-+(define_insn "reg_to_cc"
-+ [(set (cc0)
-+ (unspec:SI [(match_operand:SI 0 "register_operand" "r")]
-+ UNSPEC_REG_TO_CC))]
-+ "TARGET_HARD_FLOAT"
-+ "musfr\t%0"
-+ [(set_attr "length" "2")
-+ (set_attr "type" "alu")
-+ (set_attr "cc" "from_fpcc")])
-+
-+(define_insn "stm_fp"
-+ [(unspec [(match_operand 0 "register_operand" "r")
-+ (match_operand 1 "const_int_operand" "")
-+ (match_operand 2 "const_int_operand" "")]
-+ UNSPEC_STMFP)]
-+ "TARGET_HARD_FLOAT"
-+ {
-+ int cop_reglist = INTVAL(operands[1]);
-+
-+ if (INTVAL(operands[2]) != 0)
-+ return "stcm.w\tcp0, --%0, %C1";
-+ else
-+ return "stcm.w\tcp0, %0, %C1";
-+
-+ if ( cop_reglist & ~0xff ){
-+ operands[1] = GEN_INT(cop_reglist & ~0xff);
-+ if (INTVAL(operands[2]) != 0)
-+ return "stcm.d\tcp0, --%0, %D1";
-+ else
-+ return "stcm.d\tcp0, %0, %D1";
-+ }
-+ }
-+ [(set_attr "type" "fstm")
-+ (set_attr "length" "4")
-+ (set_attr "cc" "none")])
---- /dev/null
-+++ b/gcc/config/avr32/lib1funcs.S
-@@ -0,0 +1,2874 @@
-+/* 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
-+ 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 */
-+ lsl r11,1 /* Remove sign bit of op1 */
-+ srcs r12 /* Sign op1 to lsb of r12*/
-+ subfeq r10, 0
-+ breq 3f /* op1 zero */
-+ lsl r9,1 /* Remove sign bit of op2 */
-+ rol r12 /* Sign op2 to lsb of lr, sign bit op1 bit 1 of r12*/
-+
-+
-+ /* Check for Nan */
-+ pushm lr
-+ 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 */
-+ popm lr
-+
-+ 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:
-+ popm pc, r12=0
-+#endif
-+
-+3:
-+ lsl r9,1 /* Remove sign bit of op1 */
-+#ifdef L_avr32_f64_cmp_ge
-+ srcs r12 /* If op2 is negative then op1 >= op2. */
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+ srcc r12 /* If op2 is positve then op1 <= op2. */
-+#endif
-+ subfeq r8, 0
-+#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
-+
-+
-+#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, 8 /* 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, -1
-+ ldm sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
-+
-+17: /* 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
-+ reteq 0 /* Return zero if op1 is zero */
-+ lsl r11,1
-+ breq 4f /* Check op2 for zero */
-+
-+ /* 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*/
-+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:
-+ /* Op2 is zero ? */
-+ tst r12,r12
-+ reteq -1 /* 0.0/0.0 is NaN */
-+ /* 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 */
-+ 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 */
-+ 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, 0xff000000
-+ 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) && (__AVR32_UC__ == 3)
-+ .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
---- /dev/null
-+++ b/gcc/config/avr32/lib2funcs.S
-@@ -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
-+
-+
-+
---- /dev/null
-+++ b/gcc/config/avr32/linux-elf.h
-@@ -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}"
---- /dev/null
-+++ b/gcc/config/avr32/predicates.md
-@@ -0,0 +1,419 @@
-+;; 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 is 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 is 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 is 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 is 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 is 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 is this is a bswap operand
-+(define_predicate "avr32_bswap_operand"
-+ (ior (match_operand 0 "avr32_k12_memory_operand")
-+ (match_operand 0 "register_operand")))
-+
-+;; True is 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 is 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 is 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 is this is a floating-point register
-+(define_predicate "avr32_fp_register_operand"
-+ (and (match_operand 0 "register_operand")
-+ (match_test "REGNO_REG_CLASS(REGNO(op)) == FP_REGS")))
-+
-+;; True is this is valid avr32 symbol operand
-+(define_predicate "avr32_symbol_operand"
-+ (and (match_code "label_ref, symbol_ref, const")
-+ (match_test "avr32_find_symbol(op)")))
-+
-+;; True is this is 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 "(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")))
---- /dev/null
-+++ b/gcc/config/avr32/simd.md
-@@ -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_macro 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")])
---- /dev/null
-+++ b/gcc/config/avr32/sync.md
-@@ -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_macro 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")]
-+ )
---- /dev/null
-+++ b/gcc/config/avr32/t-avr32
-@@ -0,0 +1,77 @@
-+
-+MD_INCLUDES= $(srcdir)/config/avr32/avr32.md \
-+ $(srcdir)/config/avr32/sync.md \
-+ $(srcdir)/config/avr32/fpcp.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
-+MULTILIB_DIRNAMES = ap ucr1 ucr2 ucr2nomul
-+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?ucr1=mpart?uc3b064
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b0128
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b0256es
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b0256
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b164
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b1128
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b1256es
-+MULTILIB_MATCHES += march?ucr1=mpart?uc3b1256
-+
-+
-+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
-+
-+
-+
---- /dev/null
-+++ b/gcc/config/avr32/t-elf
-@@ -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
---- /dev/null
-+++ b/gcc/config/avr32/uclinux-elf.h
-@@ -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)
---- a/gcc/config/host-linux.c
-+++ b/gcc/config/host-linux.c
-@@ -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.
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -781,6 +781,24 @@ avr-*-*)
- tm_file="avr/avr.h dbxelf.h"
- use_fixproto=yes
- ;;
-+avr32*-*-linux*)
-+ tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/avr32.h "
-+ tmake_file="t-linux avr32/t-avr32 avr32/t-elf"
-+ 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 avr32/t-elf"
-+ 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
-@@ -1681,6 +1699,9 @@ pdp11-*-bsd)
- pdp11-*-*)
- use_fixproto=yes
- ;;
-+avr-*-*)
-+ use_fixproto=yes
-+ ;;
- # port not yet contributed
- #powerpc-*-openbsd*)
- # tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
-@@ -2717,6 +2738,32 @@ case "${target}" in
- 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
---- a/gcc/doc/extend.texi
-+++ b/gcc/doc/extend.texi
-@@ -1981,7 +1981,7 @@ this attribute to work correctly.
-
- @item interrupt
- @cindex interrupt handler functions
--Use this attribute on the ARM, AVR, C4x, CRX, M32C, M32R/D, MS1, and Xstormy16
-+Use this attribute on the ARM, AVR, AVR32, C4x, CRX, M32C, M32R/D, MS1, 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 is present.
-@@ -2000,6 +2000,15 @@ void f () __attribute__ ((interrupt ("IR
-
- 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.
-+
- @item interrupt_handler
- @cindex interrupt handler functions on the Blackfin, m68k, H8/300 and SH processors
- Use this attribute on the Blackfin, m68k, H8/300, H8/300H, H8S, and SH to
-@@ -3460,6 +3469,23 @@ placed in either the @code{.bss_below100
-
- @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
-+
- @node Type Attributes
- @section Specifying Attributes of Types
- @cindex attribute of types
-@@ -6167,6 +6193,7 @@ instructions, but allow the compiler to
- @menu
- * Alpha Built-in Functions::
- * ARM Built-in Functions::
-+* AVR32 Built-in Functions::
- * Blackfin Built-in Functions::
- * FR-V Built-in Functions::
- * X86 Built-in Functions::
-@@ -6405,6 +6432,76 @@ long long __builtin_arm_wxor (long long,
- long long __builtin_arm_wzero ()
- @end smallexample
-
-+@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
-
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -190,7 +190,7 @@ in the following sections.
- -fno-default-inline -fvisibility-inlines-hidden @gol
- -Wabi -Wctor-dtor-privacy @gol
- -Wnon-virtual-dtor -Wreorder @gol
---Weffc++ -Wno-deprecated -Wstrict-null-sentinel @gol
-+-Weffc++ -Wno-deprecated @gol
- -Wno-non-template-friend -Wold-style-cast @gol
- -Woverloaded-virtual -Wno-pmf-conversions @gol
- -Wsign-promo}
-@@ -588,6 +588,12 @@ Objective-C and Objective-C++ Dialects}.
- -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
-@@ -1868,14 +1874,6 @@ to filter out those warnings.
- @opindex Wno-deprecated
- Do not warn about usage of deprecated features. @xref{Deprecated Features}.
-
--@item -Wstrict-null-sentinel @r{(C++ only)}
--@opindex Wstrict-null-sentinel
--Warn also about the use of an uncasted @code{NULL} as sentinel. When
--compiling only with GCC this is a valid sentinel, as @code{NULL} is defined
--to @code{__null}. Although it is a null pointer constant not a null pointer,
--it is guaranteed to of the same size as a pointer. But this use is
--not portable across different compilers.
--
- @item -Wno-non-template-friend @r{(C++ only)}
- @opindex Wno-non-template-friend
- Disable warnings when non-templatized friend functions are declared
-@@ -2732,13 +2730,11 @@ requiring @option{-O}.
- 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
-@@ -6201,10 +6197,6 @@ If number of candidates in the set is sm
- 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 vect-max-version-checks
- The maximum number of runtime checks that can be performed when doing
- loop versioning in the vectorizer. See option ftree-vect-loop-version
-@@ -7402,7 +7394,7 @@ platform.
- * ARC Options::
- * ARM Options::
- * AVR Options::
--* Blackfin Options::
-+* AVR32 Options::
- * CRIS Options::
- * CRX Options::
- * Darwin Options::
-@@ -7867,81 +7859,80 @@ comply to the C standards, but it will p
- size.
- @end table
-
--@node Blackfin Options
--@subsection Blackfin Options
--@cindex Blackfin Options
-+@node AVR32 Options
-+@subsection AVR32 Options
-+@cindex AVR32 Options
-+
-+These options are defined for AVR32 implementations:
-
- @table @gcctabopt
--@item -momit-leaf-frame-pointer
--@opindex momit-leaf-frame-pointer
--Don't keep the frame pointer in a register for leaf functions. This
--avoids the instructions to save, set up and restore frame pointers and
--makes an extra register available in leaf functions. The option
--@option{-fomit-frame-pointer} removes the frame pointer for all functions
--which might make debugging harder.
-+@item -muse-rodata-section
-+@opindex muse-rodata-section
-+Use section @samp{.rodata} for read-only data instead of @samp{.text}.
-
--@item -mspecld-anomaly
--@opindex mspecld-anomaly
--When enabled, the compiler will ensure that the generated code does not
--contain speculative loads after jump instructions. This option is enabled
--by default.
--
--@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.
--This option is enabled by default.
--
--@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 -mhard-float
-+@opindex mhard-float
-+Use floating point coprocessor instructions.
-
--@item -mid-shared-library
--@opindex mid-shared-library
--Generate code that supports shared libraries via the library ID method.
--This allows for execute in place and shared libraries in an environment
--without virtual memory management. This option implies @option{-fPIC}.
-+@item -msoft-float
-+@opindex msoft-float
-+Use software floating-point library for floating-point operations.
-
--@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 -mforce-double-align
-+@opindex mforce-double-align
-+Force double-word alignment for double-word memory accesses.
-+
-+@item -mno-init-got
-+@opindex mno-init-got
-+Do not initialize the GOT register before using it when compiling PIC
-+code.
-
--@item -mshared-library-id=n
--@opindex mshared-library-id
--Specified the identification number of the ID based shared library being
--compiled. Specifying a value of 0 will generate more compact code, specifying
--other values will force the allocation of that number to the current
--library but is no more space or time efficient than omitting this option.
-+@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 -masm-addr-pseudos
-+@opindex masm-addr-pseudos
-+Use assembler pseudo-instructions lda.w and call for handling direct
-+addresses. (Enabled by default)
-+
-+@item -mpart=@var{part}
-+@opindex mpart
-+Generate code for the specified part. Permissible parts are:
-+@samp{ap7000}, @samp{ap7010},@samp{ap7020},
-+@samp{uc3a0128}, @samp{uc3a0256}, @samp{uc3a0512},
-+@samp{uc3a1128}, @samp{uc3a1256}, @samp{uc3a1512},
-+@samp{uc3b064}, @samp{uc3b0128}, @samp{uc3b0256},
-+@samp{uc3b164}, @samp{uc3b1128}, @samp{uc3b1256}.
-
--@item -mlong-calls
--@itemx -mno-long-calls
--@opindex mlong-calls
--@opindex mno-long-calls
--Tells the compiler to perform function calls by first loading the
--address of the function into a register and then performing a subroutine
--call on this register. This switch is needed if the target function
--will lie outside of the 24 bit addressing range of the offset based
--version of subroutine call instruction.
-+@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} and @samp{uc}.
-+
-+@item -mfast-float
-+@opindex mfast-float
-+Enable fast floating-point library that does not conform to ieee 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.
-
--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.
- @end table
-
- @node CRIS Options
---- a/gcc/doc/md.texi
-+++ b/gcc/doc/md.texi
-@@ -1681,6 +1681,80 @@ A memory reference suitable for iWMMXt l
- 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) (Reserved for future use)
-+
-+@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 M
-+Any 32-bit immediate with the most significant bits set to zero and the
-+remaining least significant bits set to one.
-+
-+@item J
-+A 32-bit immediate where all the lower 16-bits are zero.
-+
-+@item O
-+A 32-bit immediate with one bit set and the rest of the bits cleared.
-+
-+@item N
-+A 32-bit immediate with one bit cleared and the rest of the bits set.
-+
-+@item L
-+A 32-bit immediate where all the lower 16-bits are set.
-+
-+@item Q
-+Any AVR32 memory reference except for reference used for the atomic memory (RMW) instructions.
-+
-+@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 Y
-+A memory reference suitable for the atomic memory (RMW) instructions.
-+
-+@item Z
-+A memory reference valid for coprocessor memory instructions
-+
-+@end table
-+
- @item AVR family---@file{config/avr/constraints.md}
- @table @code
- @item l
---- a/gcc/expmed.c
-+++ b/gcc/expmed.c
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.
- #include "real.h"
- #include "recog.h"
- #include "langhooks.h"
-+#include "target.h"
-
- static void store_fixed_bit_field (rtx, unsigned HOST_WIDE_INT,
- unsigned HOST_WIDE_INT,
-@@ -454,9 +455,19 @@ store_bit_field (rtx str_rtx, unsigned H
- ? ((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))
-- || (offset * BITS_PER_UNIT % bitsize == 0
-- && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0))))
-+ : (
-+
-+ /* NB! Added for AVR32, and I think this should be true for
-+ all targets not using narrow volatile bitfields. If the
-+ bitfield is volatile then we need to perform an access
-+ consistent with the container type. */
-+ !(MEM_VOLATILE_P (op0)
-+ && GET_MODE_BITSIZE (GET_MODE (op0)) != bitsize
-+ && bitsize < BITS_PER_WORD
-+ && !targetm.narrow_volatile_bitfield ())
-+ && (! SLOW_UNALIGNED_ACCESS (fieldmode, MEM_ALIGN (op0))
-+ || (offset * BITS_PER_UNIT % bitsize == 0
-+ && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0)))))
- {
- if (MEM_P (op0))
- op0 = adjust_address (op0, fieldmode, offset);
-@@ -1256,6 +1267,13 @@ extract_bit_field (rtx str_rtx, unsigned
- && GET_MODE_SIZE (mode1) != 0
- && byte_offset % GET_MODE_SIZE (mode1) == 0)
- || (MEM_P (op0)
-+ /* NB! Added for AVR32, and I think this should be true for
-+ all targets not using narrow volatile bitfields. If the
-+ bitfield is volatile then we need to perform an access
-+ consistent with the container type. */
-+ && !(MEM_VOLATILE_P (op0)
-+ && GET_MODE_BITSIZE (GET_MODE (op0)) != bitsize
-+ && !targetm.narrow_volatile_bitfield ())
- && (! SLOW_UNALIGNED_ACCESS (mode, MEM_ALIGN (op0))
- || (offset * BITS_PER_UNIT % bitsize == 0
- && MEM_ALIGN (op0) % bitsize == 0)))))
---- a/gcc/expr.c
-+++ b/gcc/expr.c
-@@ -3519,18 +3519,19 @@ emit_single_push_insn (enum machine_mode
- }
- 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);
-
- if (type != 0)
-@@ -5509,7 +5510,21 @@ store_field (rtx target, HOST_WIDE_INT b
- 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 (
-+ /* NB! Added for AVR32, and I think this should be true for
-+ all targets not using narrow volatile bitfields. If the
-+ bitfield is volatile then we need to perform an access
-+ consistent with the container type. */
-+ (MEM_P (target)
-+ && MEM_VOLATILE_P (target)
-+ && ((GET_MODE (target) != BLKmode
-+ && GET_MODE_BITSIZE (GET_MODE (target)) > bitsize )
-+ /* If BLKmode, check if this is a record. Do not know
-+ if this is really necesarry though...*/
-+ || (GET_MODE (target) == BLKmode
-+ && TREE_CODE (type) == RECORD_TYPE))
-+ && !targetm.narrow_volatile_bitfield ())
-+ || mode == VOIDmode
- || (mode != BLKmode && ! direct_store[(int) mode]
- && GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
- && GET_MODE_CLASS (mode) != MODE_COMPLEX_FLOAT)
-@@ -7560,7 +7575,21 @@ expand_expr_real_1 (tree exp, rtx target
- 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 (
-+ /* NB! Added for AVR32, and I think this should be true for
-+ all targets not using narrow volatile bitfields. If the
-+ bitfield is volatile then we need to perform an access
-+ consistent with the container type. */
-+ (MEM_P (op0)
-+ && MEM_VOLATILE_P (op0)
-+ && ((GET_MODE (op0) != BLKmode
-+ && GET_MODE_BITSIZE (GET_MODE (op0)) > bitsize )
-+ /* If BLKmode, check if this is a record. Do not know
-+ if this is really necesarry though...*/
-+ || (GET_MODE (op0) == BLKmode
-+ && TREE_CODE (type) == RECORD_TYPE))
-+ && !targetm.narrow_volatile_bitfield ())
-+ || mode1 == VOIDmode
- || REG_P (op0) || GET_CODE (op0) == SUBREG
- || (mode1 != BLKmode && ! direct_load[(int) mode1]
- && GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
---- a/gcc/flow.c
-+++ b/gcc/flow.c
-@@ -3327,12 +3327,12 @@ not_reg_cond (rtx x)
- if (GET_CODE (x) == NOT)
- return XEXP (x, 0);
- if (COMPARISON_P (x)
-- && REG_P (XEXP (x, 0)))
-+ /* && REG_P (XEXP (x, 0))*/)
- {
-- gcc_assert (XEXP (x, 1) == const0_rtx);
-+ /*gcc_assert (XEXP (x, 1) == const0_rtx);*/
-
- return gen_rtx_fmt_ee (reversed_comparison_code (x, NULL),
-- VOIDmode, XEXP (x, 0), const0_rtx);
-+ VOIDmode, XEXP (x, 0), XEXP (x, 0) /*const0_rtx*/);
- }
- return gen_rtx_NOT (0, x);
- }
---- a/gcc/function.c
-+++ b/gcc/function.c
-@@ -2676,8 +2676,12 @@ assign_parm_setup_reg (struct assign_par
- SET_DECL_RTL (parm, parmreg);
-
- /* Copy the value into the register. */
-- if (data->nominal_mode != data->passed_mode
-- || promoted_nominal_mode != data->promoted_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;
-
---- a/gcc/genemit.c
-+++ b/gcc/genemit.c
-@@ -121,6 +121,24 @@ max_operand_vec (rtx insn, int arg)
- }
-
- 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;
-@@ -405,18 +423,16 @@ gen_insn (rtx insn, int lineno)
- 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);
-- else
-- printf ("rtx operand%d ATTRIBUTE_UNUSED", i);
-+ printf("(rtx operand0 ATTRIBUTE_UNUSED, ...)\n");
- 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)
-@@ -456,16 +472,12 @@ gen_expand (rtx expand)
- 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,
-@@ -475,6 +487,8 @@ gen_expand (rtx expand)
- && 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");
-@@ -488,6 +502,7 @@ gen_expand (rtx expand)
- 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
---- a/gcc/genflags.c
-+++ b/gcc/genflags.c
-@@ -127,7 +127,6 @@ static void
- 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 @@ gen_proto (rtx insn)
- 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 @@ gen_proto (rtx insn)
- {
- 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}");
---- a/gcc/genoutput.c
-+++ b/gcc/genoutput.c
-@@ -386,7 +386,7 @@ output_insn_data (void)
- }
-
- 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");
-
---- a/gcc/ifcvt.c
-+++ b/gcc/ifcvt.c
-@@ -77,7 +77,7 @@ static int num_possible_if_blocks;
- static int num_updated_if_blocks;
-
- /* # of changes made which require life information to be updated. */
--static int num_true_changes;
-+int num_true_changes;
-
- /* Whether conditional execution changes were made. */
- static int cond_exec_changed_p;
-@@ -287,12 +287,15 @@ cond_exec_process_insns (ce_if_block_t *
- if (must_be_last)
- return FALSE;
-
-- if (modified_in_p (test, insn))
-- {
-- if (!mod_ok)
-- return FALSE;
-- must_be_last = TRUE;
-- }
-+#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN
-+ if ( !IFCVT_ALLOW_MODIFY_TEST_IN_INSN )
-+#endif
-+ if (modified_in_p (test, insn))
-+ {
-+ if (!mod_ok)
-+ return FALSE;
-+ must_be_last = TRUE;
-+ }
-
- /* Now build the conditional form of the instruction. */
- pattern = PATTERN (insn);
-@@ -566,16 +569,19 @@ cond_exec_process_if_block (ce_if_block_
- /* Do any machine dependent final modifications. */
- IFCVT_MODIFY_FINAL (ce_info);
- #endif
--
-- /* 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;
-+ 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_if_block (ce_info);
-+ cond_exec_changed_p = TRUE;
-+ return TRUE;
-+ }
-+ return FALSE;
-
- fail:
- #ifdef IFCVT_MODIFY_CANCEL
-@@ -1050,7 +1056,11 @@ noce_try_addcc (struct noce_if_info *if_
- != 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)
-@@ -2651,7 +2661,12 @@ process_if_block (struct ce_if_block * c
- && cond_move_process_if_block (ce_info))
- return TRUE;
-
-- 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
- {
- /* If we have && and || tests, try to first handle combining the && and
- || tests into the conditional code, and if that fails, go back and
-@@ -4036,6 +4051,15 @@ rest_of_handle_if_after_reload (void)
- cleanup_cfg (CLEANUP_EXPENSIVE
- | CLEANUP_UPDATE_LIFE
- | (flag_crossjumping ? CLEANUP_CROSSJUMP : 0));
-+
-+ /* 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 (flag_if_conversion2)
- if_convert (1);
- return 0;
---- a/gcc/longlong.h
-+++ b/gcc/longlong.h
-@@ -226,6 +226,41 @@ UDItype __umulsidi3 (USItype, USItype);
- #define UDIV_TIME 100
- #endif /* __arm__ */
-
-+#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_UC__) || __AVR32_UC__ != 3
-+#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 (__hppa) && W_TYPE_SIZE == 32
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add %4,%5,%1\n\taddc %2,%3,%0" \
---- a/gcc/optabs.h
-+++ b/gcc/optabs.h
-@@ -431,7 +431,7 @@ extern enum insn_code reload_out_optab[N
- extern GTY(()) 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. */
---- a/gcc/regrename.c
-+++ b/gcc/regrename.c
-@@ -1592,6 +1592,9 @@ copyprop_hardreg_forward_1 (basic_block
- 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;
-@@ -1630,7 +1633,60 @@ copyprop_hardreg_forward_1 (basic_block
- || (predicated && recog_data.operand_type[i] == OP_OUT))
- 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)
---- a/gcc/reload.c
-+++ b/gcc/reload.c
-@@ -4574,7 +4574,7 @@ find_reloads_toplev (rtx x, int opnum, e
- x = mem;
- i = find_reloads_address (GET_MODE (x), &x, XEXP (x, 0), &XEXP (x, 0),
- opnum, type, ind_levels, insn);
-- if (x != mem)
-+ if (!rtx_equal_p (x, mem))
- push_reg_equiv_alt_mem (regno, x);
- if (address_reloaded)
- *address_reloaded = i;
---- a/gcc/sched-deps.c
-+++ b/gcc/sched-deps.c
-@@ -649,7 +649,14 @@ fixup_sched_groups (rtx insn)
-
- 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);
- }
-
-@@ -1123,8 +1130,29 @@ sched_analyze_insn (struct deps *deps, r
-
- 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);
---- a/gcc/testsuite/gcc.dg/sibcall-3.c
-+++ b/gcc/testsuite/gcc.dg/sibcall-3.c
-@@ -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-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* m681?-*-* m680*-*-* m68k-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
-+/* { dg-do run { xfail arc-*-* avr-*-* avr32-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* m681?-*-* m680*-*-* m68k-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
- /* { dg-options "-O2 -foptimize-sibling-calls" } */
-
- /* The option -foptimize-sibling-calls is the default, but serves as
---- a/gcc/testsuite/gcc.dg/sibcall-4.c
-+++ b/gcc/testsuite/gcc.dg/sibcall-4.c
-@@ -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-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* m681?-*-* m680*-*-* m68k-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
-+/* { dg-do run { xfail arc-*-* avr-*-* avr32-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* m681?-*-* m680*-*-* m68k-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
- /* { dg-options "-O2 -foptimize-sibling-calls" } */
-
- /* The option -foptimize-sibling-calls is the default, but serves as
---- a/gcc/testsuite/gcc.dg/trampoline-1.c
-+++ b/gcc/testsuite/gcc.dg/trampoline-1.c
-@@ -46,6 +46,8 @@ void foo (void)
-
- int main (void)
- {
-+#ifndef NO_TRAMPOLINES
- foo ();
-+#endif
- return 0;
- }
---- a/gcc/testsuite/g++.old-deja/g++.pt/static11.C
-+++ b/gcc/testsuite/g++.old-deja/g++.pt/static11.C
-@@ -2,7 +2,7 @@
- // in their dejagnu baseboard description) require that the status is
- // final when exit is entered (or main returns), and not "overruled" by a
- // destructor calling _exit. It's not really worth it to handle that.
--// { dg-do run { xfail mmix-knuth-mmixware xtensa-*-elf* arm*-*-elf arm*-*-eabi m68k-*-elf } }
-+// { dg-do run { xfail mmix-knuth-mmixware xtensa-*-elf* avr32-*-elf arm*-*-elf arm*-*-eabi m68k-*-elf } }
-
- // Bug: g++ was failing to destroy C<int>::a because it was using two
- // different sentry variables for construction and destruction.
---- a/gcc/version.c
-+++ b/gcc/version.c
-@@ -8,7 +8,7 @@
- in parentheses. You may also wish to include a number indicating
- the revision of your modified compiler. */
-
--#define VERSUFFIX ""
-+#define VERSUFFIX "-atmel.1.1.3.avr32linux.1"
-
- /* This is the location of the online document giving instructions for
- reporting bugs. If you distribute a modified version of GCC,
-@@ -17,9 +17,9 @@
- forward us bugs reported to you, if you determine that they are
- not bugs in your modifications.) */
-
--const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
-+const char bug_report_url[] = "<URL:http://www.atmel.com/avr32/>";
-
- /* The complete version string, assembled from several pieces.
- BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */
-
--const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX;
-+const char version_string[] = BASEVER VERSUFFIX DATESTAMP DEVPHASE;
---- a/libstdc++-v3/acinclude.m4
-+++ b/libstdc++-v3/acinclude.m4
-@@ -125,15 +125,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
- ## other macros from doing the same. This should be automated.) -pme
- need_libmath=no
-
-- # Check for uClibc since Linux platforms use different configuration
-- # directories depending on the C library in use.
-- AC_EGREP_CPP([_using_uclibc], [
-- #include <stdio.h>
-- #if __UCLIBC__
-- _using_uclibc
-- #endif
-- ], uclibc=yes, uclibc=no)
--
- # Find platform-specific directories containing configuration info.
- # Also possibly modify flags used elsewhere, as needed by the platform.
- GLIBCXX_CHECK_HOST
-@@ -1389,8 +1380,8 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- #endif
- int main()
- {
-- const char __one[] = "Äuglein Augmen";
-- const char __two[] = "Äuglein";
-+ const char __one[] = "Äuglein Augmen";
-+ const char __two[] = "Äuglein";
- int i;
- int j;
- __locale_t loc;
---- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-@@ -31,6 +31,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.
-@@ -45,8 +47,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
- struct ctype_base
- {
- // Non-standard typedefs.
-- typedef const int* __to_type;
--
-+#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.
- typedef unsigned short mask;
---- a/libstdc++-v3/include/Makefile.in
-+++ b/libstdc++-v3/include/Makefile.in
-@@ -36,6 +36,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/fragment.am
- subdir = include
---- a/libstdc++-v3/libmath/Makefile.in
-+++ b/libstdc++-v3/libmath/Makefile.in
-@@ -37,6 +37,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- subdir = libmath
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
---- a/libstdc++-v3/libsupc++/Makefile.in
-+++ b/libstdc++-v3/libsupc++/Makefile.in
-@@ -38,6 +38,7 @@ POST_UNINSTALL = :
- 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++
---- a/libstdc++-v3/Makefile.in
-+++ b/libstdc++-v3/Makefile.in
-@@ -36,6 +36,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
- $(srcdir)/../config.sub $(srcdir)/../install-sh \
- $(srcdir)/../ltmain.sh $(srcdir)/../missing \
---- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -36,6 +36,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/fragment.am
- subdir = po
---- a/libstdc++-v3/src/Makefile.in
-+++ b/libstdc++-v3/src/Makefile.in
-@@ -36,6 +36,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/fragment.am
- subdir = src
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -481,7 +481,7 @@ lang_env_dependencies = { module=rda; };
- lang_env_dependencies = { module=winsup; };
- lang_env_dependencies = { module=qthreads; };
-
--dependencies = { module=all-target-libgloss; on=configure-target-newlib; };
-+dependencies = { module=all-target-libgloss; on=all-target-newlib; };
- dependencies = { module=all-target-winsup; on=all-target-libiberty; };
- dependencies = { module=all-target-winsup; on=all-target-libtermcap; };
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -43791,7 +43791,7 @@ all-target-libobjc: maybe-all-target-boe
- all-target-libstdc++-v3: maybe-all-target-libiberty
- install-target-libssp: maybe-install-gcc
- install-target-libgomp: maybe-install-gcc
--all-target-libgloss: maybe-configure-target-newlib
-+all-target-libgloss: maybe-all-target-newlib
- all-target-winsup: maybe-all-target-libiberty
- all-target-winsup: maybe-all-target-libtermcap
-
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -2158,7 +2158,7 @@ L2:],
- as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
- if echo "$as_ver" | grep GNU > /dev/null; then
- changequote(,)dnl
-- as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
-+ 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
-@@ -2971,7 +2971,7 @@ esac
- case "$target" in
- i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
- | x86_64*-*-* | hppa*-*-* | arm*-*-* | strongarm*-*-* | xscale*-*-* \
-- | xstormy16*-*-* | cris-*-* | xtensa-*-* | bfin-*-* | score*-*-*)
-+ | xstormy16*-*-* | cris-*-* | xtensa-*-* | bfin-*-* | score*-*-* | avr32-*-*)
- insn="nop"
- ;;
- ia64*-*-* | s390*-*-*)
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -14023,7 +14023,7 @@ L2:' > conftest.s
- # arbitrary sections are supported and try the test.
- as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
- if echo "$as_ver" | grep GNU > /dev/null; then
-- as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
-+ 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/'`
- if test $as_major -eq 2 && test $as_minor -lt 11
-@@ -15610,7 +15610,7 @@ esac
- case "$target" in
- i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
- | x86_64*-*-* | hppa*-*-* | arm*-*-* | strongarm*-*-* | xscale*-*-* \
-- | xstormy16*-*-* | cris-*-* | xtensa-*-* | bfin-*-* | score*-*-*)
-+ | xstormy16*-*-* | cris-*-* | xtensa-*-* | bfin-*-* | score*-*-* | avr32-*-*)
- insn="nop"
- ;;
- ia64*-*-* | s390*-*-*)
diff --git a/patches/gcc/4.2.2/310-libgcc_eh.a.patch b/patches/gcc/4.2.2/310-libgcc_eh.a.patch
deleted file mode 100644
index 909db3a..0000000
--- a/patches/gcc/4.2.2/310-libgcc_eh.a.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Vampirised from:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
---- gcc-4.2.2.orig/gcc/mklibgcc.in 2006-07-04 22:20:01.000000000 +0200
-+++ gcc-4.2.2/gcc/mklibgcc.in 2011-08-31 16:24:03.674690016 +0200
-@@ -223,8 +223,8 @@
- if [ "$LIBUNWIND" ]; then
- libunwind_a=$dir/libunwind.a
- fi
-+ libgcc_eh_a=$dir/libgcc_eh.a
- if [ "$SHLIB_LINK" ]; then
-- libgcc_eh_a=$dir/libgcc_eh.a
- libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
- if [ "$LIBUNWIND" ]; then
- libunwind_so=$dir/libunwind${SHLIB_EXT}
-@@ -889,11 +889,11 @@
- echo ' chmod 644' ${ldir}/libgcov.a
- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
-
-- if [ "$SHLIB_LINK" ]; then
-- echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-- echo ' chmod 644' ${ldir}/libgcc_eh.a
-- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-+ echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-+ echo ' chmod 644' ${ldir}/libgcc_eh.a
-+ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-
-+ if [ "$SHLIB_LINK" ]; then
- shlib_slibdir_qual=
- os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
- if [ "$os_multilib_dir" != . ]; then
diff --git a/patches/gcc/4.2.3/100-uclibc-conf.patch b/patches/gcc/4.2.3/100-uclibc-conf.patch
deleted file mode 100644
index 7261dae..0000000
--- a/patches/gcc/4.2.3/100-uclibc-conf.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/configure gcc-4.2.1/boehm-gc/configure
---- gcc-4.2.1.orig/boehm-gc/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4323,7 +4323,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/contrib/regression/objs-gcc.sh gcc-4.2.1/contrib/regression/objs-gcc.sh
---- gcc-4.2.1.orig/contrib/regression/objs-gcc.sh 2005-08-15 02:41:31.000000000 +0200
-+++ gcc-4.2.1/contrib/regression/objs-gcc.sh 2007-08-03 20:29:22.000000000 +0200
-@@ -105,6 +105,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.2.1.orig/gcc/config/cris/linux.h gcc-4.2.1/gcc/config/cris/linux.h
---- gcc-4.2.1.orig/gcc/config/cris/linux.h 2006-02-18 12:12:51.000000000 +0100
-+++ gcc-4.2.1/gcc/config/cris/linux.h 2007-08-03 20:29:22.000000000 +0200
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
-diff -durN gcc-4.2.1.orig/libffi/configure gcc-4.2.1/libffi/configure
---- gcc-4.2.1.orig/libffi/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libffi/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3460,7 +3460,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgfortran/configure gcc-4.2.1/libgfortran/configure
---- gcc-4.2.1.orig/libgfortran/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgfortran/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3721,7 +3721,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libgomp/configure gcc-4.2.1/libgomp/configure
---- gcc-4.2.1.orig/libgomp/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libgomp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3893,7 +3893,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/configure gcc-4.2.1/libjava/classpath/configure
---- gcc-4.2.1.orig/libjava/classpath/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/libjava/classpath/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5307,7 +5307,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libjava/classpath/ltconfig gcc-4.2.1/libjava/classpath/ltconfig
---- gcc-4.2.1.orig/libjava/classpath/ltconfig 2006-08-07 22:37:50.000000000 +0200
-+++ gcc-4.2.1/libjava/classpath/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/libjava/configure gcc-4.2.1/libjava/configure
---- gcc-4.2.1.orig/libjava/configure 2007-07-19 16:33:56.000000000 +0200
-+++ gcc-4.2.1/libjava/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5424,7 +5424,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libmudflap/configure gcc-4.2.1/libmudflap/configure
---- gcc-4.2.1.orig/libmudflap/configure 2006-12-04 12:13:07.000000000 +0100
-+++ gcc-4.2.1/libmudflap/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -5394,7 +5394,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libobjc/configure gcc-4.2.1/libobjc/configure
---- gcc-4.2.1.orig/libobjc/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libobjc/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3314,7 +3314,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libssp/configure gcc-4.2.1/libssp/configure
---- gcc-4.2.1.orig/libssp/configure 2006-10-15 09:42:57.000000000 +0200
-+++ gcc-4.2.1/libssp/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4480,7 +4480,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -4283,7 +4283,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/libtool.m4 gcc-4.2.1/libtool.m4
---- gcc-4.2.1.orig/libtool.m4 2005-07-16 04:30:53.000000000 +0200
-+++ gcc-4.2.1/libtool.m4 2007-08-03 20:29:22.000000000 +0200
-@@ -739,7 +739,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-diff -durN gcc-4.2.1.orig/ltconfig gcc-4.2.1/ltconfig
---- gcc-4.2.1.orig/ltconfig 2007-02-14 18:08:35.000000000 +0100
-+++ gcc-4.2.1/ltconfig 2007-08-03 20:29:22.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -durN gcc-4.2.1.orig/zlib/configure gcc-4.2.1/zlib/configure
---- gcc-4.2.1.orig/zlib/configure 2007-01-17 19:10:26.000000000 +0100
-+++ gcc-4.2.1/zlib/configure 2007-08-03 20:29:22.000000000 +0200
-@@ -3429,7 +3429,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
diff --git a/patches/gcc/4.2.3/110-uclibc-conf-noupstream.patch b/patches/gcc/4.2.3/110-uclibc-conf-noupstream.patch
deleted file mode 100644
index 1c239d6..0000000
--- a/patches/gcc/4.2.3/110-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-02-03 06:25:20.000000000 +0100
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-@@ -1964,7 +1964,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.2.3/120-uclibc-locale.patch b/patches/gcc/4.2.3/120-uclibc-locale.patch
deleted file mode 100644
index 298c505..0000000
--- a/patches/gcc/4.2.3/120-uclibc-locale.patch
+++ /dev/null
@@ -1,2806 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 gcc-4.2.1/libstdc++-v3/acinclude.m4
---- gcc-4.2.1.orig/libstdc++-v3/acinclude.m4 2007-06-29 01:02:05.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/acinclude.m4 2007-08-03 20:30:21.000000000 +0200
-@@ -1334,7 +1334,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
-
- # Deal with gettext issues. Default to not using it (=no) until we detect
- # support for it later. Let the user turn it off via --e/d, but let that
-@@ -1355,6 +1355,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ *-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -1526,6 +1529,40 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ AC_MSG_RESULT(uclibc)
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+ AC_SUBST(glibcxx_MOFILES)
-+ AC_SUBST(glibcxx_POFILES)
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno> // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L) strtof((S), (E))
-+#define __strtod_l(S, E, L) strtod((S), (E))
-+#define __strtold_l(S, E, L) strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c) NULL
-+#define __freelocale(a) ((void)0)
-+#define __duplocale(a) __c_locale()
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ template<>
-+ void
-+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+ const __c_locale& __cloc)
-+ {
-+ if (!(__err & ios_base::failbit))
-+ {
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
-+ }
-+ }
-+
-+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
-+ __c_locale __old)
-+ {
-+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ if (!__cloc)
-+ {
-+ // This named locale is not supported by the underlying OS.
-+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+ "name not valid"));
-+ }
-+#endif
-+ }
-+
-+ void
-+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+ {
-+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
-+ }
-+
-+ __c_locale
-+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+ { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+ {
-+ "LC_CTYPE",
-+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
-+ "LC_MONETARY",
-+ "LC_MESSAGES",
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
-+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
-+#endif
-+ };
-+}
-+
-+namespace std
-+{
-+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+} // namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.8 Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring> // get std::strlen
-+#include <cstdio> // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h> // For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h> // For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> // For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+ extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ typedef __locale_t __c_locale;
-+#else
-+ typedef int* __c_locale;
-+#endif
-+
-+ // Convert numeric value of type _Tv to string and return length of
-+ // string. If snprintf is available use it, otherwise fall back to
-+ // the unsafe sprintf which, in general, can be dangerous and should
-+ // be avoided.
-+ template<typename _Tv>
-+ int
-+ __convert_from_v(char* __out,
-+ const int __size __attribute__ ((__unused__)),
-+ const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ _Tv __v, const __c_locale& __cloc, int __prec)
-+ {
-+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+ _Tv __v, const __c_locale&, int __prec)
-+ {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+ char* __old = std::setlocale(LC_ALL, NULL);
-+ char* __sav = new char[std::strlen(__old) + 1];
-+ std::strcpy(__sav, __old);
-+ std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+ __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ std::setlocale(LC_ALL, __sav);
-+ delete [] __sav;
-+#endif
-+ return __ret;
-+ }
-+}
-+
-+#endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
-+
-+#endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+ // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
-+ const intern_type* __from_end, const intern_type*& __from_next,
-+ extern_type* __to, extern_type* __to_end,
-+ extern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+ // in case we fall back to wcrtomb and then continue, in a loop.
-+ // NB: wcsnrtombs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+ __from_end - __from_next);
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // wcrtomb.
-+ for (; __from < __from_next; ++__from)
-+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ extern_type __buf[MB_LEN_MAX];
-+ __tmp_state = __state;
-+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+ if (__conv > static_cast<size_t>(__to_end - __to_next))
-+ __ret = partial;
-+ else
-+ {
-+ memcpy(__to_next, __buf, __conv);
-+ __state = __tmp_state;
-+ __to_next += __conv;
-+ ++__from_next;
-+ }
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ codecvt_base::result
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
-+ const extern_type* __from_end, const extern_type*& __from_next,
-+ intern_type* __to, intern_type* __to_end,
-+ intern_type*& __to_next) const
-+ {
-+ result __ret = ok;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we store a L'\0' and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+ for (__from_next = __from, __to_next = __to;
-+ __from_next < __from_end && __to_next < __to_end
-+ && __ret == ok;)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+ __from_end
-+ - __from_next));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __from_end;
-+
-+ __from = __from_next;
-+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+ __from_chunk_end - __from_next,
-+ __to_end - __to_next, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (;; ++__to_next, __from += __conv)
-+ {
-+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __from_next = __from;
-+ __state = __tmp_state;
-+ __ret = error;
-+ }
-+ else if (__from_next && __from_next < __from_chunk_end)
-+ {
-+ // It is unclear what to return in this case (see DR 382).
-+ __to_next += __conv;
-+ __ret = partial;
-+ }
-+ else
-+ {
-+ __from_next = __from_chunk_end;
-+ __to_next += __conv;
-+ }
-+
-+ if (__from_next < __from_end && __ret == ok)
-+ {
-+ if (__to_next < __to_end)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from_next;
-+ *__to_next++ = L'\0';
-+ }
-+ else
-+ __ret = partial;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_encoding() const throw()
-+ {
-+ // XXX This implementation assumes that the encoding is
-+ // stateless and is either single-byte or variable-width.
-+ int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ if (MB_CUR_MAX == 1)
-+ __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_max_length() const throw()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+ // XXX Probably wrong for stateful encodings.
-+ int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __ret;
-+ }
-+
-+ int
-+ codecvt<wchar_t, char, mbstate_t>::
-+ do_length(state_type& __state, const extern_type* __from,
-+ const extern_type* __end, size_t __max) const
-+ {
-+ int __ret = 0;
-+ state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+ // in case we advance past it and then continue, in a loop.
-+ // NB: mbsnrtowcs is a GNU extension
-+
-+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+ // its fourth parameter (it wouldn't with NULL as first parameter).
-+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
-+ * __max));
-+ while (__from < __end && __max)
-+ {
-+ const extern_type* __from_chunk_end;
-+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+ __end
-+ - __from));
-+ if (!__from_chunk_end)
-+ __from_chunk_end = __end;
-+
-+ const extern_type* __tmp_from = __from;
-+ size_t __conv = mbsnrtowcs(__to, &__from,
-+ __from_chunk_end - __from,
-+ __max, &__state);
-+ if (__conv == static_cast<size_t>(-1))
-+ {
-+ // In case of error, in order to stop at the exact place we
-+ // have to start again from the beginning with a series of
-+ // mbrtowc.
-+ for (__from = __tmp_from;; __from += __conv)
-+ {
-+ __conv = mbrtowc(NULL, __from, __end - __from,
-+ &__tmp_state);
-+ if (__conv == static_cast<size_t>(-1)
-+ || __conv == static_cast<size_t>(-2))
-+ break;
-+ }
-+ __state = __tmp_state;
-+ __ret += __from - __tmp_from;
-+ break;
-+ }
-+ if (!__from)
-+ __from = __from_chunk_end;
-+
-+ __ret += __from - __tmp_from;
-+ __max -= __conv;
-+
-+ if (__from < __end && __max)
-+ {
-+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
-+ ++__from;
-+ ++__ret;
-+ --__max;
-+ }
-+ }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+
-+ return __ret;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+ // These are basically extensions to char_traits, and perhaps should
-+ // be put there instead of here.
-+ template<>
-+ int
-+ collate<char>::_M_compare(const char* __one, const char* __two) const
-+ {
-+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<char>::_M_transform(char* __to, const char* __from,
-+ size_t __n) const
-+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ int
-+ collate<wchar_t>::_M_compare(const wchar_t* __one,
-+ const wchar_t* __two) const
-+ {
-+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+ }
-+
-+ template<>
-+ size_t
-+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+ size_t __n) const
-+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L) wctype((S))
-+#define __towupper_l(C, L) towupper((C))
-+#define __towlower_l(C, L) towlower((C))
-+#define __iswctype_l(C, M, L) iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+ // NB: The other ctype<char> specializations are in src/locale.cc and
-+ // various /config/os/* files.
-+ template<>
-+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __refs)
-+ {
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ ctype<wchar_t>::__wmask_type
-+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+ {
-+ __wmask_type __ret;
-+ switch (__m)
-+ {
-+ case space:
-+ __ret = __wctype_l("space", _M_c_locale_ctype);
-+ break;
-+ case print:
-+ __ret = __wctype_l("print", _M_c_locale_ctype);
-+ break;
-+ case cntrl:
-+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+ break;
-+ case upper:
-+ __ret = __wctype_l("upper", _M_c_locale_ctype);
-+ break;
-+ case lower:
-+ __ret = __wctype_l("lower", _M_c_locale_ctype);
-+ break;
-+ case alpha:
-+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
-+ break;
-+ case digit:
-+ __ret = __wctype_l("digit", _M_c_locale_ctype);
-+ break;
-+ case punct:
-+ __ret = __wctype_l("punct", _M_c_locale_ctype);
-+ break;
-+ case xdigit:
-+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+ break;
-+ case alnum:
-+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
-+ break;
-+ case graph:
-+ __ret = __wctype_l("graph", _M_c_locale_ctype);
-+ break;
-+ default:
-+ __ret = __wmask_type();
-+ }
-+ return __ret;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_toupper(wchar_t __c) const
-+ { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::do_tolower(wchar_t __c) const
-+ { return __towlower_l(__c, _M_c_locale_ctype); }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+ ++__lo;
-+ }
-+ return __hi;
-+ }
-+
-+ bool
-+ ctype<wchar_t>::
-+ do_is(mask __m, wchar_t __c) const
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ bool __ret = false;
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur]
-+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ return __ret;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+ {
-+ for (; __lo < __hi; ++__vec, ++__lo)
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ mask __m = 0;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ __m |= _M_bit[__bitcur];
-+ *__vec = __m;
-+ }
-+ return __hi;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+ {
-+ while (__lo < __hi && !this->do_is(__m, *__lo))
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+ {
-+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+ ++__lo;
-+ return __lo;
-+ }
-+
-+ wchar_t
-+ ctype<wchar_t>::
-+ do_widen(char __c) const
-+ { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+ const char*
-+ ctype<wchar_t>::
-+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+ {
-+ while (__lo < __hi)
-+ {
-+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+ ++__lo;
-+ ++__dest;
-+ }
-+ return __hi;
-+ }
-+
-+ char
-+ ctype<wchar_t>::
-+ do_narrow(wchar_t __wc, char __dfault) const
-+ {
-+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+ return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+
-+ const wchar_t*
-+ ctype<wchar_t>::
-+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
-+ char* __dest) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ if (_M_narrow_ok)
-+ while (__lo < __hi)
-+ {
-+ if (*__lo >= 0 && *__lo < 128)
-+ *__dest = _M_narrow[*__lo];
-+ else
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ }
-+ ++__lo;
-+ ++__dest;
-+ }
-+ else
-+ while (__lo < __hi)
-+ {
-+ const int __c = wctob(*__lo);
-+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+ ++__lo;
-+ ++__dest;
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ return __hi;
-+ }
-+
-+ void
-+ ctype<wchar_t>::_M_initialize_ctype()
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+ wint_t __i;
-+ for (__i = 0; __i < 128; ++__i)
-+ {
-+ const int __c = wctob(__i);
-+ if (__c == EOF)
-+ break;
-+ else
-+ _M_narrow[__i] = static_cast<char>(__c);
-+ }
-+ if (__i == 128)
-+ _M_narrow_ok = true;
-+ else
-+ _M_narrow_ok = false;
-+ for (size_t __j = 0;
-+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+ _M_widen[__j] = btowc(__j);
-+
-+ for (size_t __k = 0; __k <= 11; ++__k)
-+ {
-+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+ }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#endif
-+ }
-+#endif // _GLIBCXX_USE_WCHAR_T
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+ const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+ // Specializations.
-+ template<>
-+ string
-+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+ __uselocale(__old);
-+ return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ const char* __msg = gettext(__dfault.c_str());
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return string(__msg);
-+#else
-+ const char* __msg = gettext(__dfault.c_str());
-+ return string(__msg);
-+#endif
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ wstring
-+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+ {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(_M_c_locale_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ __uselocale(__old);
-+ return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_messages);
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+ return _M_convert_from_char(__msg);
-+# else
-+ char* __msg = gettext(_M_convert_to_char(__dfault));
-+ return _M_convert_from_char(__msg);
-+# endif
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2 messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+ const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D) ((void)0)
-+#define __bindtextdomain(D,P) ((void)0)
-+#endif
-+
-+ // Non-virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-+ _M_name_messages(_S_get_c_name())
-+ { }
-+
-+ template<typename _CharT>
-+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+ _M_name_messages(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_messages = __tmp;
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-+ const char* __dir) const
-+ {
-+ __bindtextdomain(__s.c_str(), __dir);
-+ return this->do_open(__s, __loc);
-+ }
-+
-+ // Virtual member functions.
-+ template<typename _CharT>
-+ messages<_CharT>::~messages()
-+ {
-+ if (_M_name_messages != _S_get_c_name())
-+ delete [] _M_name_messages;
-+ _S_destroy_c_locale(_M_c_locale_messages);
-+ }
-+
-+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
-+ const locale&) const
-+ {
-+ // No error checking is done, assume the catalog exists and can
-+ // be used.
-+ __textdomain(__s.c_str());
-+ return 0;
-+ }
-+
-+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
-+ { }
-+
-+ // messages_byname
-+ template<typename _CharT>
-+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+ : messages<_CharT>(__refs)
-+ {
-+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+ delete [] this->_M_name_messages;
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ this->_M_name_messages = __tmp;
-+
-+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+ {
-+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-+ }
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ // Construct and return valid pattern consisting of some combination of:
-+ // space none symbol sign value
-+ money_base::pattern
-+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+ {
-+ pattern __ret;
-+
-+ // This insanely complicated routine attempts to construct a valid
-+ // pattern for use with monyepunct. A couple of invariants:
-+
-+ // if (__precedes) symbol -> value
-+ // else value -> symbol
-+
-+ // if (__space) space
-+ // else none
-+
-+ // none == never first
-+ // space never first or last
-+
-+ // Any elegant implementations of this are welcome.
-+ switch (__posn)
-+ {
-+ case 0:
-+ case 1:
-+ // 1 The sign precedes the value and symbol.
-+ __ret.field[0] = sign;
-+ if (__space)
-+ {
-+ // Pattern starts with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[3] = symbol;
-+ }
-+ __ret.field[2] = space;
-+ }
-+ else
-+ {
-+ // Pattern starts with sign and ends with none.
-+ if (__precedes)
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[1] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 2:
-+ // 2 The sign follows the value and symbol.
-+ if (__space)
-+ {
-+ // Pattern either ends with sign.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[2] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[2] = symbol;
-+ }
-+ __ret.field[1] = space;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ // Pattern ends with sign then none.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = value;
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ __ret.field[1] = symbol;
-+ }
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ break;
-+ case 3:
-+ // 3 The sign immediately precedes the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = symbol;
-+ }
-+ else
-+ {
-+ __ret.field[1] = sign;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ case 4:
-+ // 4 The sign immediately follows the symbol.
-+ if (__precedes)
-+ {
-+ __ret.field[0] = symbol;
-+ __ret.field[1] = sign;
-+ if (__space)
-+ {
-+ __ret.field[2] = space;
-+ __ret.field[3] = value;
-+ }
-+ else
-+ {
-+ __ret.field[2] = value;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ else
-+ {
-+ __ret.field[0] = value;
-+ if (__space)
-+ {
-+ __ret.field[1] = space;
-+ __ret.field[2] = symbol;
-+ __ret.field[3] = sign;
-+ }
-+ else
-+ {
-+ __ret.field[1] = symbol;
-+ __ret.field[2] = sign;
-+ __ret.field[3] = none;
-+ }
-+ }
-+ break;
-+ default:
-+ ;
-+ }
-+ return __ret;
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+ const char*)
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<char, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = "";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = "";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = "";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
-+ __cloc));
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = "()";
-+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+ __cloc);
-+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+ // _Intl == false
-+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<char, true>::~moneypunct()
-+ { delete _M_data; }
-+
-+ template<>
-+ moneypunct<char, false>::~moneypunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
-+ __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ void
-+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const char*)
-+#else
-+ const char* __name)
-+#endif
-+ {
-+ if (!_M_data)
-+ _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = 0;
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = 0;
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = 0;
-+ _M_data->_M_frac_digits = 0;
-+ _M_data->_M_pos_format = money_base::_S_default_pattern;
-+ _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+ _M_data->_M_atoms[__i] =
-+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __c_locale __old = __uselocale(__cloc);
-+#else
-+ // Switch to named locale so that mbsrtowcs will work.
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+ wchar_t* __wcs_ps = 0;
-+ wchar_t* __wcs_ns = 0;
-+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+ try
-+ {
-+ mbstate_t __state;
-+ size_t __len;
-+ __len = strlen(__cpossign);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ps = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+ _M_data->_M_positive_sign = __wcs_ps;
-+ }
-+ else
-+ _M_data->_M_positive_sign = L"";
-+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+
-+ __len = strlen(__cnegsign);
-+ if (!__nposn)
-+ _M_data->_M_negative_sign = L"()";
-+ else if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ __wcs_ns = new wchar_t[__len];
-+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+ _M_data->_M_negative_sign = __wcs_ns;
-+ }
-+ else
-+ _M_data->_M_negative_sign = L"";
-+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+ // _Intl == true.
-+ __len = strlen(__ccurr);
-+ if (__len)
-+ {
-+ ++__len;
-+ memset(&__state, 0, sizeof(mbstate_t));
-+ wchar_t* __wcs = new wchar_t[__len];
-+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+ _M_data->_M_curr_symbol = __wcs;
-+ }
-+ else
-+ _M_data->_M_curr_symbol = L"";
-+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+ }
-+ catch (...)
-+ {
-+ delete _M_data;
-+ _M_data = 0;
-+ delete __wcs_ps;
-+ delete __wcs_ns;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
-+ __pposn);
-+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
-+ __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __uselocale(__old);
-+#else
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ }
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, true>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+
-+ template<>
-+ moneypunct<wchar_t, false>::~moneypunct()
-+ {
-+ if (_M_data->_M_positive_sign_size)
-+ delete [] _M_data->_M_positive_sign;
-+ if (_M_data->_M_negative_sign_size
-+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+ delete [] _M_data->_M_negative_sign;
-+ if (_M_data->_M_curr_symbol_size)
-+ delete [] _M_data->_M_curr_symbol;
-+ delete _M_data;
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = '.';
-+ _M_data->_M_thousands_sep = ',';
-+
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+ }
-+ else
-+ {
-+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
-+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
-+ __cloc));
-+
-+ // Check for NULL, which implies no grouping.
-+ if (_M_data->_M_thousands_sep == '\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = "true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = "false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<char>::~numpunct()
-+ { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __numpunct_cache<wchar_t>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_data->_M_grouping = "";
-+ _M_data->_M_grouping_size = 0;
-+ _M_data->_M_use_grouping = false;
-+
-+ _M_data->_M_decimal_point = L'.';
-+ _M_data->_M_thousands_sep = L',';
-+
-+ // Use ctype::widen code without the facet...
-+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+ _M_data->_M_atoms_out[__i] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+ _M_data->_M_atoms_in[__j] =
-+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+ }
-+ else
-+ {
-+ // Named locale.
-+ // NB: In the GNU model wchar_t is always 32 bit wide.
-+ union { char *__s; wchar_t __w; } __u;
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+ _M_data->_M_decimal_point = __u.__w;
-+
-+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+ _M_data->_M_thousands_sep = __u.__w;
-+
-+ if (_M_data->_M_thousands_sep == L'\0')
-+ _M_data->_M_grouping = "";
-+ else
-+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+ }
-+
-+ // NB: There is no way to extact this info from posix locales.
-+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+ _M_data->_M_truename = L"true";
-+ _M_data->_M_truename_size = 4;
-+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+ _M_data->_M_falsename = L"false";
-+ _M_data->_M_falsename_size = 5;
-+ }
-+
-+ template<>
-+ numpunct<wchar_t>::~numpunct()
-+ { delete _M_data; }
-+ #endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L) nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+ template<>
-+ void
-+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = '\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<char>;
-+
-+ if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = "%m/%d/%y";
-+ _M_data->_M_date_era_format = "%m/%d/%y";
-+ _M_data->_M_time_format = "%H:%M:%S";
-+ _M_data->_M_time_era_format = "%H:%M:%S";
-+ _M_data->_M_date_time_format = "";
-+ _M_data->_M_date_time_era_format = "";
-+ _M_data->_M_am = "AM";
-+ _M_data->_M_pm = "PM";
-+ _M_data->_M_am_pm_format = "";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = "Sunday";
-+ _M_data->_M_day2 = "Monday";
-+ _M_data->_M_day3 = "Tuesday";
-+ _M_data->_M_day4 = "Wednesday";
-+ _M_data->_M_day5 = "Thursday";
-+ _M_data->_M_day6 = "Friday";
-+ _M_data->_M_day7 = "Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = "Sun";
-+ _M_data->_M_aday2 = "Mon";
-+ _M_data->_M_aday3 = "Tue";
-+ _M_data->_M_aday4 = "Wed";
-+ _M_data->_M_aday5 = "Thu";
-+ _M_data->_M_aday6 = "Fri";
-+ _M_data->_M_aday7 = "Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = "January";
-+ _M_data->_M_month02 = "February";
-+ _M_data->_M_month03 = "March";
-+ _M_data->_M_month04 = "April";
-+ _M_data->_M_month05 = "May";
-+ _M_data->_M_month06 = "June";
-+ _M_data->_M_month07 = "July";
-+ _M_data->_M_month08 = "August";
-+ _M_data->_M_month09 = "September";
-+ _M_data->_M_month10 = "October";
-+ _M_data->_M_month11 = "November";
-+ _M_data->_M_month12 = "December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = "Jan";
-+ _M_data->_M_amonth02 = "Feb";
-+ _M_data->_M_amonth03 = "Mar";
-+ _M_data->_M_amonth04 = "Apr";
-+ _M_data->_M_amonth05 = "May";
-+ _M_data->_M_amonth06 = "Jun";
-+ _M_data->_M_amonth07 = "Jul";
-+ _M_data->_M_amonth08 = "Aug";
-+ _M_data->_M_amonth09 = "Sep";
-+ _M_data->_M_amonth10 = "Oct";
-+ _M_data->_M_amonth11 = "Nov";
-+ _M_data->_M_amonth12 = "Dec";
-+ }
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+ __cloc);
-+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+ }
-+ }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
-+ void
-+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
-+ const tm* __tm) const
-+ {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+ _M_c_locale_timepunct);
-+#else
-+ char* __old = strdup(setlocale(LC_ALL, NULL));
-+ setlocale(LC_ALL, _M_name_timepunct);
-+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+ setlocale(LC_ALL, __old);
-+ free(__old);
-+#endif
-+ // Make sure __s is null terminated.
-+ if (__len == 0)
-+ __s[0] = L'\0';
-+ }
-+
-+ template<>
-+ void
-+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+ {
-+ if (!_M_data)
-+ _M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+// if (!__cloc)
-+ {
-+ // "C" locale
-+ _M_c_locale_timepunct = _S_get_c_locale();
-+
-+ _M_data->_M_date_format = L"%m/%d/%y";
-+ _M_data->_M_date_era_format = L"%m/%d/%y";
-+ _M_data->_M_time_format = L"%H:%M:%S";
-+ _M_data->_M_time_era_format = L"%H:%M:%S";
-+ _M_data->_M_date_time_format = L"";
-+ _M_data->_M_date_time_era_format = L"";
-+ _M_data->_M_am = L"AM";
-+ _M_data->_M_pm = L"PM";
-+ _M_data->_M_am_pm_format = L"";
-+
-+ // Day names, starting with "C"'s Sunday.
-+ _M_data->_M_day1 = L"Sunday";
-+ _M_data->_M_day2 = L"Monday";
-+ _M_data->_M_day3 = L"Tuesday";
-+ _M_data->_M_day4 = L"Wednesday";
-+ _M_data->_M_day5 = L"Thursday";
-+ _M_data->_M_day6 = L"Friday";
-+ _M_data->_M_day7 = L"Saturday";
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ _M_data->_M_aday1 = L"Sun";
-+ _M_data->_M_aday2 = L"Mon";
-+ _M_data->_M_aday3 = L"Tue";
-+ _M_data->_M_aday4 = L"Wed";
-+ _M_data->_M_aday5 = L"Thu";
-+ _M_data->_M_aday6 = L"Fri";
-+ _M_data->_M_aday7 = L"Sat";
-+
-+ // Month names, starting with "C"'s January.
-+ _M_data->_M_month01 = L"January";
-+ _M_data->_M_month02 = L"February";
-+ _M_data->_M_month03 = L"March";
-+ _M_data->_M_month04 = L"April";
-+ _M_data->_M_month05 = L"May";
-+ _M_data->_M_month06 = L"June";
-+ _M_data->_M_month07 = L"July";
-+ _M_data->_M_month08 = L"August";
-+ _M_data->_M_month09 = L"September";
-+ _M_data->_M_month10 = L"October";
-+ _M_data->_M_month11 = L"November";
-+ _M_data->_M_month12 = L"December";
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ _M_data->_M_amonth01 = L"Jan";
-+ _M_data->_M_amonth02 = L"Feb";
-+ _M_data->_M_amonth03 = L"Mar";
-+ _M_data->_M_amonth04 = L"Apr";
-+ _M_data->_M_amonth05 = L"May";
-+ _M_data->_M_amonth06 = L"Jun";
-+ _M_data->_M_amonth07 = L"Jul";
-+ _M_data->_M_amonth08 = L"Aug";
-+ _M_data->_M_amonth09 = L"Sep";
-+ _M_data->_M_amonth10 = L"Oct";
-+ _M_data->_M_amonth11 = L"Nov";
-+ _M_data->_M_amonth12 = L"Dec";
-+ }
-+#if 0
-+ else
-+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
-+
-+ union { char *__s; wchar_t *__w; } __u;
-+
-+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+ _M_data->_M_date_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+ _M_data->_M_date_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+ _M_data->_M_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+ _M_data->_M_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+ _M_data->_M_date_time_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+ _M_data->_M_date_time_era_format = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+ _M_data->_M_am = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+ _M_data->_M_pm = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+ _M_data->_M_am_pm_format = __u.__w;
-+
-+ // Day names, starting with "C"'s Sunday.
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+ _M_data->_M_day1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+ _M_data->_M_day2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+ _M_data->_M_day3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+ _M_data->_M_day4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+ _M_data->_M_day5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+ _M_data->_M_day6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+ _M_data->_M_day7 = __u.__w;
-+
-+ // Abbreviated day names, starting with "C"'s Sun.
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+ _M_data->_M_aday1 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+ _M_data->_M_aday2 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+ _M_data->_M_aday3 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+ _M_data->_M_aday4 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+ _M_data->_M_aday5 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+ _M_data->_M_aday6 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+ _M_data->_M_aday7 = __u.__w;
-+
-+ // Month names, starting with "C"'s January.
-+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+ _M_data->_M_month01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+ _M_data->_M_month02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+ _M_data->_M_month03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+ _M_data->_M_month04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+ _M_data->_M_month05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+ _M_data->_M_month06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+ _M_data->_M_month07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+ _M_data->_M_month08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+ _M_data->_M_month09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+ _M_data->_M_month10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+ _M_data->_M_month11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+ _M_data->_M_month12 = __u.__w;
-+
-+ // Abbreviated month names, starting with "C"'s Jan.
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+ _M_data->_M_amonth01 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+ _M_data->_M_amonth02 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+ _M_data->_M_amonth03 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+ _M_data->_M_amonth04 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+ _M_data->_M_amonth05 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+ _M_data->_M_amonth06 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+ _M_data->_M_amonth07 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+ _M_data->_M_amonth08 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+ _M_data->_M_amonth09 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+ _M_data->_M_amonth10 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+ _M_data->_M_amonth11 = __u.__w;
-+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+ _M_data->_M_amonth12 = __u.__w;
-+ }
-+#endif // 0
-+ }
-+#endif
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library. This library 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 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 General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; 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, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself 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.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
-+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(_S_get_c_name())
-+ { _M_initialize_timepunct(); }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+ size_t __refs)
-+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-+ _M_name_timepunct(__s)
-+ {
-+ char* __tmp = new char[std::strlen(__s) + 1];
-+ std::strcpy(__tmp, __s);
-+ _M_name_timepunct = __tmp;
-+ _M_initialize_timepunct(__cloc);
-+ }
-+
-+ template<typename _CharT>
-+ __timepunct<_CharT>::~__timepunct()
-+ {
-+ if (_M_name_timepunct != _S_get_c_name())
-+ delete [] _M_name_timepunct;
-+ delete _M_data;
-+ _S_destroy_c_locale(_M_c_locale_timepunct);
-+ }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:29:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-@@ -5769,7 +5769,7 @@
- enableval="$enable_clocale"
-
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
- *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
- { (exit 1); exit 1; }; } ;;
-@@ -5802,6 +5802,9 @@
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
-+ linux-uclibc*)
-+ enable_clocale_flag=uclibc
-+ ;;
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- enable_clocale_flag=gnu
- ;;
-@@ -6190,6 +6193,76 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ uclibc)
-+ echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+ # Declare intention to use gettext, and add support for specific
-+ # languages.
-+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+ ALL_LINGUAS="de fr"
-+
-+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$check_msgfmt"; then
-+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_check_msgfmt="yes"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+ USE_NLS=yes
-+ fi
-+ # Export the build objects.
-+ for ling in $ALL_LINGUAS; do \
-+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+ done
-+
-+
-+
-+ CLOCALE_H=config/locale/uclibc/c_locale.h
-+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+ CMESSAGES_H=config/locale/uclibc/messages_members.h
-+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+ CTIME_H=config/locale/uclibc/time_members.h
-+ CTIME_CC=config/locale/uclibc/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+ ;;
- esac
-
- # This is where the testsuite looks for locale catalogs, using the
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2005-08-17 04:28:44.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/c_compatibility/wchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
-
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cwchar.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cwchar.h 2007-08-03 20:30:21.000000000 +0200
-@@ -182,7 +182,9 @@
- using ::wcscoll;
- using ::wcscpy;
- using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using ::wcsftime;
-+#endif
- using ::wcslen;
- using ::wcsncat;
- using ::wcsncmp;
diff --git a/patches/gcc/4.2.3/130-uclibc-locale-no__x.patch b/patches/gcc/4.2.3/130-uclibc-locale-no__x.patch
deleted file mode 100644
index d88dc22..0000000
--- a/patches/gcc/4.2.3/130-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
--#define __strtof_l(S, E, L) strtof((S), (E))
--#define __strtod_l(S, E, L) strtod((S), (E))
--#define __strtold_l(S, E, L) strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c) NULL
--#define __freelocale(a) ((void)0)
--#define __duplocale(a) __c_locale()
--#endif
--
- namespace std
- {
- template<>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-@@ -68,6 +68,7 @@
- {
- extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
-
- namespace std
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2007-08-03 20:30:53.000000000 +0200
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif
-
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l iswctype_l
-+# define __towlower_l towlower_l
-+# define __towupper_l towupper_l
-+# define __wcscoll_l wcscoll_l
-+# define __wcsftime_l wcsftime_l
-+# define __wcsxfrm_l wcsxfrm_l
-+# define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L) nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
-+# define __strtod_l(S, E, L) strtod((S), (E))
-+# define __strtof_l(S, E, L) strtof((S), (E))
-+# define __strtold_l(S, E, L) strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c) NULL
-+# define __freelocale(a) ((void)0)
-+# define __duplocale(a) __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+# define __iswctype_l(C, M, L) iswctype((C), (M))
-+# define __towlower_l(C, L) towlower((C))
-+# define __towupper_l(C, L) towupper((C))
-+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
-+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
-+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
-+# define __wctype_l(S, L) wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
- // These are basically extensions to char_traits, and perhaps should
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L) wctype((S))
--#define __towupper_l(C, L) towupper((C))
--#define __towlower_l(C, L) towlower((C))
--#define __iswctype_l(C, M, L) iswctype((C), (M))
--#endif
--
- namespace std
- {
- // NB: The other ctype<char> specializations are in src/locale.cc and
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
-- const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
-- const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D) ((void)0)
--#define __bindtextdomain(D,P) ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D) ((void)0)
-+#define bindtextdomain(D,P) ((void)0)
- #endif
-
- // Non-virtual member functions.
-@@ -70,7 +66,7 @@
- messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
- const char* __dir) const
- {
-- __bindtextdomain(__s.c_str(), __dir);
-+ bindtextdomain(__s.c_str(), __dir);
- return this->do_open(__s, __loc);
- }
-
-@@ -90,7 +86,7 @@
- {
- // No error checking is done, assume the catalog exists and can
- // be used.
-- __textdomain(__s.c_str());
-+ textdomain(__s.c_str());
- return 0;
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
-
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
--
- namespace std
- {
- // Construct and return valid pattern consisting of some combination of:
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2007-08-03 20:30:53.000000000 +0200
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L) nl_langinfo((N))
--#endif
-
- namespace std
- {
diff --git a/patches/gcc/4.2.3/140-uclibc-locale-wchar_fix.patch b/patches/gcc/4.2.3/140-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 077bb56..0000000
--- a/patches/gcc/4.2.3/140-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-@@ -127,12 +127,25 @@
- {
- // Named locale.
- // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- union { char *__s; wchar_t __w; } __u;
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- _M_data->_M_decimal_point = __u.__w;
-
- __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- _M_data->_M_thousands_sep = __u.__w;
-+#endif
-
- if (_M_data->_M_thousands_sep == L'\0')
- _M_data->_M_grouping = "";
diff --git a/patches/gcc/4.2.3/150-uclibc-locale-update.patch b/patches/gcc/4.2.3/150-uclibc-locale-update.patch
deleted file mode 100644
index 534f4e4..0000000
--- a/patches/gcc/4.2.3/150-uclibc-locale-update.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -46,16 +46,13 @@
- __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- float __f = __strtof_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __f;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ float __f = __strtof_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __f;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -63,16 +60,13 @@
- __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- double __d = __strtod_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __d;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ double __d = __strtod_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __d;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- template<>
-@@ -80,16 +74,13 @@
- __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- const __c_locale& __cloc)
- {
-- if (!(__err & ios_base::failbit))
-- {
-- char* __sanity;
-- errno = 0;
-- long double __ld = __strtold_l(__s, &__sanity, __cloc);
-- if (__sanity != __s && errno != ERANGE)
-- __v = __ld;
-- else
-- __err |= ios_base::failbit;
-- }
-+ char* __sanity;
-+ errno = 0;
-+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+ if (__sanity != __s && errno != ERANGE)
-+ __v = __ld;
-+ else
-+ __err |= ios_base::failbit;
- }
-
- void
-@@ -110,7 +101,7 @@
- void
- locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
- {
-- if (_S_get_c_locale() != __cloc)
-+ if (__cloc && _S_get_c_locale() != __cloc)
- __freelocale(__cloc);
- }
-
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2007-08-03 20:31:54.000000000 +0200
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
-
- #include <cstring> // get std::strlen
--#include <cstdio> // get std::snprintf or std::sprintf
-+#include <cstdio> // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h> // For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h> // For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> // For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h> // For messages
- #endif
-+#include <cstdarg>
-
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
-
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
--
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
- typedef int* __c_locale;
- #endif
-
-- // Convert numeric value of type _Tv to string and return length of
-- // string. If snprintf is available use it, otherwise fall back to
-- // the unsafe sprintf which, in general, can be dangerous and should
-+ // Convert numeric value of type double to string and return length of
-+ // string. If vsnprintf is available use it, otherwise fall back to
-+ // the unsafe vsprintf which, in general, can be dangerous and should
- // be avoided.
-- template<typename _Tv>
-- int
-- __convert_from_v(char* __out,
-- const int __size __attribute__ ((__unused__)),
-- const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
-- _Tv __v, const __c_locale& __cloc, int __prec)
-+ inline int
-+ __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+ __cloc __attribute__ ((__unused__))
-+#endif
-+ ,
-+ char* __out,
-+ const int __size,
-+ const char* __fmt, ...)
- {
-+ va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
- __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
-- _Tv __v, const __c_locale&, int __prec)
-- {
- # ifdef __UCLIBC_HAS_LOCALE__
- char* __old = std::setlocale(LC_ALL, NULL);
- char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
-
-- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+ va_start(__args, __fmt);
-+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+ va_end(__args);
-
- #ifdef __UCLIBC_HAS_XCLOCALE__
- __gnu_cxx::__uselocale(__old);
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- namespace std
-@@ -138,20 +143,34 @@
- ctype<wchar_t>::
- do_is(mask __m, wchar_t __c) const
- {
-- // Highest bitmask in ctype_base == 10, but extra in "C"
-- // library for blank.
-+ // The case of __m == ctype_base::space is particularly important,
-+ // due to its use in many istream functions. Therefore we deal with
-+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+ // is the mask corresponding to ctype_base::space. NB: an encoding
-+ // change would not affect correctness!
- bool __ret = false;
-- const size_t __bitmasksize = 11;
-- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-- if (__m & _M_bit[__bitcur]
-- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-- {
-- __ret = true;
-- break;
-- }
-+ if (__m == _M_bit[5])
-+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+ else
-+ {
-+ // Highest bitmask in ctype_base == 10, but extra in "C"
-+ // library for blank.
-+ const size_t __bitmasksize = 11;
-+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+ if (__m & _M_bit[__bitcur])
-+ {
-+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+ {
-+ __ret = true;
-+ break;
-+ }
-+ else if (__m == _M_bit[__bitcur])
-+ break;
-+ }
-+ }
- return __ret;
- }
--
-+
- const wchar_t*
- ctype<wchar_t>::
- do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:30:53.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -47,18 +47,21 @@
- template<typename _CharT>
- messages<_CharT>::messages(size_t __refs)
- : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-- _M_name_messages(_S_get_c_name())
-+ _M_name_messages(_S_get_c_name())
- { }
-
- template<typename _CharT>
- messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- size_t __refs)
-- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-- _M_name_messages(__s)
-+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_messages = __tmp;
-+
-+ // Last to avoid leaking memory if new throws.
-+ _M_c_locale_messages = _S_clone_c_locale(__cloc);
- }
-
- template<typename _CharT>
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- }
- break;
- default:
-- ;
-+ __ret = pattern();
- }
- return __ret;
- }
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:24.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2007-08-03 20:31:54.000000000 +0200
-@@ -33,9 +33,14 @@
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
-
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
-
- #ifdef __UCLIBC_MJN3_ONLY__
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-@@ -37,25 +37,33 @@
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
- : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(_S_get_c_name())
-+ _M_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-- _M_name_timepunct(__s)
-+ _M_name_timepunct(NULL)
- {
-- char* __tmp = new char[std::strlen(__s) + 1];
-- std::strcpy(__tmp, __s);
-+ const size_t __len = std::strlen(__s) + 1;
-+ char* __tmp = new char[__len];
-+ std::memcpy(__tmp, __s, __len);
- _M_name_timepunct = __tmp;
-- _M_initialize_timepunct(__cloc);
-+
-+ try
-+ { _M_initialize_timepunct(__cloc); }
-+ catch(...)
-+ {
-+ delete [] _M_name_timepunct;
-+ __throw_exception_again;
-+ }
- }
-
- template<typename _CharT>
diff --git a/patches/gcc/4.2.3/160-libstdc++-pic.patch b/patches/gcc/4.2.3/160-libstdc++-pic.patch
deleted file mode 100644
index 7244d4c..0000000
--- a/patches/gcc/4.2.3/160-libstdc++-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am 2006-07-28 06:57:34.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.am 2007-08-03 20:32:27.000000000 +0200
-@@ -257,6 +257,12 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in
---- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/src/Makefile.in 2007-08-03 20:32:27.000000000 +0200
-@@ -657,7 +657,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -690,6 +690,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
-+ install-exec-local \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolexeclibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
-@@ -799,6 +800,13 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.2.3/170-missing-execinfo_h.patch b/patches/gcc/4.2.3/170-missing-execinfo_h.patch
deleted file mode 100644
index ff67899..0000000
--- a/patches/gcc/4.2.3/170-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/boehm-gc/include/gc.h gcc-4.2.1/boehm-gc/include/gc.h
---- gcc-4.2.1.orig/boehm-gc/include/gc.h 2006-09-18 20:45:08.000000000 +0200
-+++ gcc-4.2.1/boehm-gc/include/gc.h 2007-08-03 20:33:00.000000000 +0200
-@@ -502,7 +502,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.2.3/180-c99-snprintf.patch b/patches/gcc/4.2.3/180-c99-snprintf.patch
deleted file mode 100644
index ddb0c34..0000000
--- a/patches/gcc/4.2.3/180-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h
---- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h 2006-12-07 10:33:51.000000000 +0100
-+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h 2007-08-03 20:33:24.000000000 +0200
-@@ -144,7 +144,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.2.3/190-c99-complex-ugly-hack.patch b/patches/gcc/4.2.3/190-c99-complex-ugly-hack.patch
deleted file mode 100644
index de6d71c..0000000
--- a/patches/gcc/4.2.3/190-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/configure gcc-4.2.1/libstdc++-v3/configure
---- gcc-4.2.1.orig/libstdc++-v3/configure 2007-08-03 20:30:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/configure 2007-08-03 20:33:56.000000000 +0200
-@@ -7514,6 +7514,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.2.3/200-index_macro.patch b/patches/gcc/4.2.3/200-index_macro.patch
deleted file mode 100644
index 1e56b5d..0000000
--- a/patches/gcc/4.2.3/200-index_macro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200
-@@ -58,6 +58,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.2.3/210-libmudflap-susv3-legacy.patch b/patches/gcc/4.2.3/210-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 26e8704..0000000
--- a/patches/gcc/4.2.3/210-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c
---- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.2.3/220-libstdc++-namespace.patch b/patches/gcc/4.2.3/220-libstdc++-namespace.patch
deleted file mode 100644
index 709e8f2..0000000
--- a/patches/gcc/4.2.3/220-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -32,7 +32,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- this->_S_create_c_locale(this->_M_c_locale_messages, __s);
- }
- }
-+}
-diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:31:54.000000000 +0200
-+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h 2007-08-03 20:35:40.000000000 +0200
-@@ -33,7 +33,8 @@
- //
-
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- template<typename _CharT>
- __timepunct<_CharT>::__timepunct(size_t __refs)
- : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
-@@ -74,3 +75,4 @@
- delete _M_data;
- _S_destroy_c_locale(_M_c_locale_timepunct);
- }
-+}
diff --git a/patches/gcc/4.2.3/230-libbackend_dep_gcov-iov.h.patch b/patches/gcc/4.2.3/230-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 32754be..0000000
--- a/patches/gcc/4.2.3/230-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
---- gcc-4.2.1.orig/gcc/Makefile.in 2007-05-31 17:37:38.000000000 +0200
-+++ gcc-4.2.1/gcc/Makefile.in 2007-08-03 20:36:14.000000000 +0200
-@@ -2660,7 +2660,7 @@
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
- insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DTARGET_NAME=\"$(target_noncanonical)\" \
- -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc/4.2.3/240-arm-bigendian.patch b/patches/gcc/4.2.3/240-arm-bigendian.patch
deleted file mode 100644
index 2abeccd..0000000
--- a/patches/gcc/4.2.3/240-arm-bigendian.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/config/arm/linux-elf.h gcc-4.2.1/gcc/config/arm/linux-elf.h
---- gcc-4.2.1.orig/gcc/config/arm/linux-elf.h 2006-02-17 00:29:10.000000000 +0100
-+++ gcc-4.2.1/gcc/config/arm/linux-elf.h 2007-08-03 20:36:43.000000000 +0200
-@@ -28,19 +28,33 @@
- #undef TARGET_VERSION
- #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
-
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-@@ -61,7 +75,7 @@
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
- -X \
-- %{mbig-endian:-EB}" \
-+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
- SUBTARGET_EXTRA_LINK_SPEC
-
- #undef LINK_SPEC
-diff -durN gcc-4.2.1.orig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.orig/gcc/config.gcc 2007-08-03 20:29:52.000000000 +0200
-+++ gcc-4.2.1/gcc/config.gcc 2007-08-03 20:36:43.000000000 +0200
-@@ -705,6 +705,11 @@
- tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- tmake_file="${tmake_file} t-linux arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ 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"
diff --git a/patches/gcc/4.2.3/250-softfloat-fix.patch b/patches/gcc/4.2.3/250-softfloat-fix.patch
deleted file mode 100644
index 3517856..0000000
--- a/patches/gcc/4.2.3/250-softfloat-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-This patch (C) 2007 Yann E. MORIN
-Licensed under GPL v2.
-
-First hunk of this patch solves compiling uClibc:
-
-make[1]: Entering directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
- LD libuClibc-0.9.29.so
-libc/libc_so.a(difftime.os): In function `difftime':
-difftime.c:(.text+0x8): undefined reference to `__floatsidf'
-difftime.c:(.text+0x2c): undefined reference to `__subdf3'
-libc/libc_so.a(_fpmaxtostr.os): In function `_fpmaxtostr':
-_fpmaxtostr.c:(.text+0xd4): undefined reference to `__nedf2'
-_fpmaxtostr.c:(.text+0xf8): undefined reference to `__eqdf2'
-_fpmaxtostr.c:(.text+0x114): undefined reference to `__divdf3'
-_fpmaxtostr.c:(.text+0x120): undefined reference to `__ltdf2'
-_fpmaxtostr.c:(.text+0x1c4): undefined reference to `__muldf3'
-_fpmaxtostr.c:(.text+0x388): undefined reference to `__gedf2'
-_fpmaxtostr.c:(.text+0x430): undefined reference to `__adddf3'
-libc/libc_so.a(__psfs_do_numeric.os): In function `__psfs_do_numeric':
-__psfs_do_numeric.c:(.text+0x520): undefined reference to `__truncdfsf2'
-libc/libc_so.a(strtof.os): In function `strtof':
-strtof.c:(.text+0x1c): undefined reference to `__extendsfdf2'
-/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/cc_core_prefix/lib/gcc/arm-linux-uclibc/4.1.1/libgcc.a(_fixunsdfsi.o):
-In function `__fixunsdfsi':
-libgcc2.c:(.text+0x34): undefined reference to `__fixdfsi'
-make[2]: *** [lib/libc.so] Error 1
-make[1]: *** [lib/libc.so.0] Error 2
-make[1]: Leaving directory `/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc'
-make: *** [/home/ymorin/x-tools/build/armeb-unknown-linux-uclibc/gcc-4.1.1-uClibc-0.9.28.1/build-libc/lib/libc.a]
-Error 2
-
-The second hunk fixes building final gcc because soft-float implies using -lfloat (which we don't have).
-
-
-diff -dur gcc-4.2.0.orig/gcc/config.gcc gcc-4.2.0/gcc/config.gcc
---- gcc-4.2.0.orig/gcc/config.gcc 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc 2007-07-15 11:26:02.000000000 +0200
-@@ -721,7 +721,7 @@
- default_use_cxa_atexit=yes
- ;;
- *)
-- tmake_file="$tmake_file arm/t-linux"
-+ tmake_file="$tmake_file arm/t-linux arm/t-arm-elf"
- ;;
- esac
- tm_file="$tm_file arm/aout.h arm/arm.h"
-diff -dur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-07-15 11:24:18.000000000 +0200
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-07-15 11:26:02.000000000 +0200
-@@ -63,7 +63,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.2.3/260-flatten-switch-stmt-00.patch b/patches/gcc/4.2.3/260-flatten-switch-stmt-00.patch
deleted file mode 100644
index 6c40c57..0000000
--- a/patches/gcc/4.2.3/260-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.2.1.orig/gcc/stmt.c gcc-4.2.1/gcc/stmt.c
---- gcc-4.2.1.orig/gcc/stmt.c 2007-07-19 05:25:32.000000000 +0200
-+++ gcc-4.2.1/gcc/stmt.c 2007-08-03 20:37:19.000000000 +0200
-@@ -2512,7 +2512,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3070,6 +3074,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.2.3/270-soft-float.patch b/patches/gcc/4.2.3/270-soft-float.patch
deleted file mode 100644
index 4287bfa..0000000
--- a/patches/gcc/4.2.3/270-soft-float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
---- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c 2007-03-05 11:54:00.000000000 -0500
-+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c 2008-01-31 17:51:24.000000000 -0500
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
- but GCC currently generates poor code when a union is used to turn
- a long double into a pair of doubles. */
-
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
- return z.ldval;
- }
-
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);
diff --git a/patches/gcc/4.2.3/280-eabi_fixes.patch b/patches/gcc/4.2.3/280-eabi_fixes.patch
deleted file mode 100644
index 7dce608..0000000
--- a/patches/gcc/4.2.3/280-eabi_fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.2.3.orig/gcc/config/arm/linux-eabi.h gcc-4.2.3/gcc/config/arm/linux-eabi.h
---- gcc-4.2.3.orig/gcc/config/arm/linux-eabi.h 2007-09-01 17:28:30.000000000 +0200
-+++ gcc-4.2.3/gcc/config/arm/linux-eabi.h 2008-05-25 23:47:36.000000000 +0200
-@@ -47,7 +47,8 @@
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-
- #undef SUBTARGET_EXTRA_LINK_SPEC
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
-+#define SUBTARGET_EXTRA_LINK_SPEC \
-+ " %{mlittle-endian:-m armelf_linux_eabi} %{mbig-endian:-m armelfb_linux_eabi}"
-
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
- GNU/Linux binaries on an EABI system. */
diff --git a/patches/gcc/4.2.3/290-alpha-signal_h.patch b/patches/gcc/4.2.3/290-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.2.3/290-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.2.3/300-fortran-signed-TImode.patch b/patches/gcc/4.2.3/300-fortran-signed-TImode.patch
deleted file mode 100644
index 01e2f01..0000000
--- a/patches/gcc/4.2.3/300-fortran-signed-TImode.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix building gfortran for ARM.
-http://gcc.gnu.org/ml/gcc-patches/2007-05/msg01010.html
-----
-
-The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
-
-This target doesn't really have a 128-bit integer type, however it does use
-TImode to represent the return value of certain special ABI defined library
-functions. This results in type_for_size(TImode) being called.
-
-Because TImode deosn't correspond to any gfortran integer kind
-gfc_type_for_size returns NULL and we segfault shortly after.
-
-The patch below fixes this by making gfc_type_for_size handle TImode in the
-same way as the C frontend.
-
-Tested on x86_64-linux and arm-linux-gnueabi.
-Applied to trunk.
-
-Paul
-
-2007-05-15 Paul Brook <paul@codesourcery.com>
-
- gcc/fortran/
- * trans-types.c (gfc_type_for_size): Handle signed TImode.
-
-diff -durN gcc-4.2.3.old/gcc/fortran/trans-types.c gcc-4.2.3/gcc/fortran/trans-types.c
---- gcc-4.2.3.old/gcc/fortran/trans-types.c 2007-08-31 10:27:50.000000000 +0200
-+++ gcc-4.2.3/gcc/fortran/trans-types.c 2008-07-17 09:54:20.000000000 +0200
-@@ -1799,6 +1799,13 @@
- if (type && bits == TYPE_PRECISION (type))
- return type;
- }
-+
-+ /* Handle TImode as a special case because it is used by some backends
-+ (eg. ARM) even though it is not available for normal use. */
-+#if HOST_BITS_PER_WIDE_INT >= 64
-+ if (bits == TYPE_PRECISION (intTI_type_node))
-+ return intTI_type_node;
-+#endif
- }
- else
- {
diff --git a/patches/gcc/4.2.3/310-sh-without-headers.patch b/patches/gcc/4.2.3/310-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.2.3/310-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.2.3/320-libgcc_eh.a.patch b/patches/gcc/4.2.3/320-libgcc_eh.a.patch
deleted file mode 100644
index 909db3a..0000000
--- a/patches/gcc/4.2.3/320-libgcc_eh.a.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Vampirised from:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
---- gcc-4.2.2.orig/gcc/mklibgcc.in 2006-07-04 22:20:01.000000000 +0200
-+++ gcc-4.2.2/gcc/mklibgcc.in 2011-08-31 16:24:03.674690016 +0200
-@@ -223,8 +223,8 @@
- if [ "$LIBUNWIND" ]; then
- libunwind_a=$dir/libunwind.a
- fi
-+ libgcc_eh_a=$dir/libgcc_eh.a
- if [ "$SHLIB_LINK" ]; then
-- libgcc_eh_a=$dir/libgcc_eh.a
- libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
- if [ "$LIBUNWIND" ]; then
- libunwind_so=$dir/libunwind${SHLIB_EXT}
-@@ -889,11 +889,11 @@
- echo ' chmod 644' ${ldir}/libgcov.a
- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
-
-- if [ "$SHLIB_LINK" ]; then
-- echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-- echo ' chmod 644' ${ldir}/libgcc_eh.a
-- echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-+ echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
-+ echo ' chmod 644' ${ldir}/libgcc_eh.a
-+ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
-
-+ if [ "$SHLIB_LINK" ]; then
- shlib_slibdir_qual=
- os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
- if [ "$os_multilib_dir" != . ]; then
diff --git a/patches/gcc/4.3.1/100-alpha-mieee-default.patch b/patches/gcc/4.3.1/100-alpha-mieee-default.patch
deleted file mode 100644
index e449669..0000000
--- a/patches/gcc/4.3.1/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
-Set the default behavior on alpha to use -mieee since the large majority of
-time we want this (bad/weird things can happen with packages built without
--mieee).
-
-To satisfy those people who may not want -mieee forced on them all the time,
-we also provide -mno-ieee.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.h gcc-4.3.1/gcc/config/alpha/alpha.h
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.h 2007-12-06 14:25:37.000000000 +0100
-+++ gcc-4.3.1/gcc/config/alpha/alpha.h 2008-06-10 14:56:36.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.opt gcc-4.3.1/gcc/config/alpha/alpha.opt
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/alpha/alpha.opt 2008-06-10 14:56:36.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.3.1/110-trampolinewarn.patch b/patches/gcc/4.3.1/110-trampolinewarn.patch
deleted file mode 100644
index 7dcfe4d..0000000
--- a/patches/gcc/4.3.1/110-trampolinewarn.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-trampolinewarn.patch
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
-diff -durN gcc-4.3.1.orig/gcc/builtins.c gcc-4.3.1/gcc/builtins.c
---- gcc-4.3.1.orig/gcc/builtins.c 2008-04-23 00:36:27.000000000 +0200
-+++ gcc-4.3.1/gcc/builtins.c 2008-06-10 14:56:54.000000000 +0200
-@@ -5662,6 +5662,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.3.1.orig/gcc/common.opt gcc-4.3.1/gcc/common.opt
---- gcc-4.3.1.orig/gcc/common.opt 2008-01-22 15:11:44.000000000 +0100
-+++ gcc-4.3.1/gcc/common.opt 2008-06-10 14:56:54.000000000 +0200
-@@ -182,6 +182,10 @@
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.3.1/120-java-nomulti.patch b/patches/gcc/4.3.1/120-java-nomulti.patch
deleted file mode 100644
index ad43ce4..0000000
--- a/patches/gcc/4.3.1/120-java-nomulti.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
-diff -durN gcc-4.3.1.orig/libjava/configure gcc-4.3.1/libjava/configure
---- gcc-4.3.1.orig/libjava/configure 2008-06-06 16:49:11.000000000 +0200
-+++ gcc-4.3.1/libjava/configure 2008-06-10 14:57:38.000000000 +0200
-@@ -1018,6 +1018,8 @@
- --enable-gconf-peer compile GConf native peers for util.preferences
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1850,6 +1852,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
---- gcc-4.3.1.orig/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100
-+++ gcc-4.3.1/libjava/configure.ac 2008-06-10 14:57:38.000000000 +0200
-@@ -82,6 +82,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.3.1/130-cross-compile.patch b/patches/gcc/4.3.1/130-cross-compile.patch
deleted file mode 100644
index b6710a3..0000000
--- a/patches/gcc/4.3.1/130-cross-compile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
-diff -durN gcc-4.3.1.orig/gcc/configure gcc-4.3.1/gcc/configure
---- gcc-4.3.1.orig/gcc/configure 2008-05-21 10:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/configure 2008-06-10 14:57:42.000000000 +0200
-@@ -13283,7 +13283,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.1.orig/gcc/configure.ac gcc-4.3.1/gcc/configure.ac
---- gcc-4.3.1.orig/gcc/configure.ac 2008-05-21 10:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/configure.ac 2008-06-10 14:57:42.000000000 +0200
-@@ -1749,7 +1749,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.1.orig/gcc/unwind-dw2.c gcc-4.3.1/gcc/unwind-dw2.c
---- gcc-4.3.1.orig/gcc/unwind-dw2.c 2007-07-25 20:14:57.000000000 +0200
-+++ gcc-4.3.1/gcc/unwind-dw2.c 2008-06-10 14:57:42.000000000 +0200
-@@ -334,9 +334,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.3.1/140-netbsd-symbolic.patch b/patches/gcc/4.3.1/140-netbsd-symbolic.patch
deleted file mode 100644
index d06a04a..0000000
--- a/patches/gcc/4.3.1/140-netbsd-symbolic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/11_all_gcc-netbsd-symbolic.patch
-http://bugs.gentoo.org/122698
-
-diff -durN gcc-4.3.1.orig/gcc/config/netbsd-elf.h gcc-4.3.1/gcc/config/netbsd-elf.h
---- gcc-4.3.1.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.3.1/gcc/config/netbsd-elf.h 2008-06-10 14:57:48.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.3.1/150-sparc64-bsd.patch b/patches/gcc/4.3.1/150-sparc64-bsd.patch
deleted file mode 100644
index 5ac2b43..0000000
--- a/patches/gcc/4.3.1/150-sparc64-bsd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/14_all_gcc-sparc64-bsd.patch
-diff -durN gcc-4.3.1.orig/gcc/config/sparc/freebsd.h gcc-4.3.1/gcc/config/sparc/freebsd.h
---- gcc-4.3.1.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/sparc/freebsd.h 2008-06-10 14:57:54.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.3.1/160-flatten-switch-stmt-00.patch b/patches/gcc/4.3.1/160-flatten-switch-stmt-00.patch
deleted file mode 100644
index 55cafcb..0000000
--- a/patches/gcc/4.3.1/160-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
-http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
-
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-diff -durN gcc-4.3.1.orig/gcc/stmt.c gcc-4.3.1/gcc/stmt.c
---- gcc-4.3.1.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
-+++ gcc-4.3.1/gcc/stmt.c 2008-06-10 14:57:58.000000000 +0200
-@@ -2509,7 +2509,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3067,6 +3071,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.3.1/170-libiberty-pic.patch b/patches/gcc/4.3.1/170-libiberty-pic.patch
deleted file mode 100644
index 0b1e6b4..0000000
--- a/patches/gcc/4.3.1/170-libiberty-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
-diff -durN gcc-4.3.1.orig/libiberty/Makefile.in gcc-4.3.1/libiberty/Makefile.in
---- gcc-4.3.1.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200
-+++ gcc-4.3.1/libiberty/Makefile.in 2008-06-10 14:58:02.000000000 +0200
-@@ -225,6 +225,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.3.1/180-superh-default-multilib.patch b/patches/gcc/4.3.1/180-superh-default-multilib.patch
deleted file mode 100644
index bc24221..0000000
--- a/patches/gcc/4.3.1/180-superh-default-multilib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
-The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-05-21 10:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-06-10 14:58:06.000000000 +0200
-@@ -2278,7 +2278,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.3.1/190-libstdc++-pic.patch b/patches/gcc/4.3.1/190-libstdc++-pic.patch
deleted file mode 100644
index 61cab19..0000000
--- a/patches/gcc/4.3.1/190-libstdc++-pic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch
-install libstdc++_pic.a if we have pic objs
-
-diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am gcc-4.3.1/libstdc++-v3/src/Makefile.am
---- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/src/Makefile.am 2008-06-10 14:58:09.000000000 +0200
-@@ -289,6 +289,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in gcc-4.3.1/libstdc++-v3/src/Makefile.in
---- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/src/Makefile.in 2008-06-10 14:58:09.000000000 +0200
-@@ -693,7 +693,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -732,7 +732,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -858,6 +858,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.3.1/200-pr24170.patch b/patches/gcc/4.3.1/200-pr24170.patch
deleted file mode 100644
index cd13698..0000000
--- a/patches/gcc/4.3.1/200-pr24170.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
-http://gcc.gnu.org/PR24170
-
-2008-02-20 Tom Tromey <tromey@redhat.com>
-
- PR libgcj/24170:
- * java/io/natFilePosix.cc (File::performList): Don't use
- readdir_r.
- * configure, include/config.h.in: Rebuilt.
- * configure.ac: Don't check for readdir_r.
-
-diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
---- gcc-4.3.1.orig/libjava/configure.ac 2008-06-10 14:57:42.000000000 +0200
-+++ gcc-4.3.1/libjava/configure.ac 2008-06-10 14:58:13.000000000 +0200
-@@ -1030,7 +1030,7 @@
- PLATFORMNET=NoNet
- else
- AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
-- localtime_r readdir_r getpwuid_r getcwd \
-+ localtime_r getpwuid_r getcwd \
- access stat lstat mkdir rename rmdir unlink utime chmod readlink \
- nl_langinfo setlocale \
- inet_pton uname inet_ntoa \
-diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in
---- gcc-4.3.1.orig/libjava/include/config.h.in 2007-07-31 18:17:21.000000000 +0200
-+++ gcc-4.3.1/libjava/include/config.h.in 2008-06-10 14:58:13.000000000 +0200
-@@ -214,9 +214,6 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
-
--/* Define to 1 if you have the `readdir_r' function. */
--#undef HAVE_READDIR_R
--
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
-diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc
---- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc 2007-08-04 23:50:01.000000000 +0200
-+++ gcc-4.3.1/libjava/java/io/natFilePosix.cc 2008-06-10 14:58:13.000000000 +0200
-@@ -1,6 +1,6 @@
- // natFile.cc - Native part of File class for POSIX.
-
--/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
-+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
- Free Software Foundation
-
- This file is part of libgcj.
-@@ -292,13 +292,7 @@
-
- java::util::ArrayList *list = new java::util::ArrayList ();
- struct dirent *d;
--#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-- int name_max = pathconf (buf, _PC_NAME_MAX);
-- char dbuf[sizeof (struct dirent) + name_max + 1];
-- while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
--#else /* HAVE_READDIR_R */
- while ((d = readdir (dir)) != NULL)
--#endif /* HAVE_READDIR_R */
- {
- // Omit "." and "..".
- if (d->d_name[0] == '.'
diff --git a/patches/gcc/4.3.1/210-noteGNUstack-00.patch b/patches/gcc/4.3.1/210-noteGNUstack-00.patch
deleted file mode 100644
index d656661..0000000
--- a/patches/gcc/4.3.1/210-noteGNUstack-00.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
-2004-09-20 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
- on ppc64-linux.
-
- * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
- ia64-linux.
- * config/ia64/crtbegin.asm: Likewise.
- * config/ia64/crtend.asm: Likewise.
- * config/ia64/crti.asm: Likewise.
- * config/ia64/crtn.asm: Likewise.
-
-2004-05-14 Jakub Jelinek <jakub@redhat.com>
-
- * config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtbegin.asm gcc-4.3.1/gcc/config/ia64/crtbegin.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtbegin.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtbegin.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -255,3 +255,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtend.asm gcc-4.3.1/gcc/config/ia64/crtend.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtend.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtend.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -122,3 +122,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crti.asm gcc-4.3.1/gcc/config/ia64/crti.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crti.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crti.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -64,3 +64,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtn.asm gcc-4.3.1/gcc/config/ia64/crtn.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtn.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtn.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -54,3 +54,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/lib1funcs.asm gcc-4.3.1/gcc/config/ia64/lib1funcs.asm
---- gcc-4.3.1.orig/gcc/config/ia64/lib1funcs.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/lib1funcs.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -792,3 +792,7 @@
- }
- .endp __floattitf
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/linux.h gcc-4.3.1/gcc/config/ia64/linux.h
---- gcc-4.3.1.orig/gcc/config/ia64/linux.h 2006-12-12 16:15:19.000000000 +0100
-+++ gcc-4.3.1/gcc/config/ia64/linux.h 2008-06-10 14:58:17.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.3.1.orig/gcc/config/rs6000/ppc-asm.h gcc-4.3.1/gcc/config/rs6000/ppc-asm.h
---- gcc-4.3.1.orig/gcc/config/rs6000/ppc-asm.h 2003-06-04 18:44:51.000000000 +0200
-+++ gcc-4.3.1/gcc/config/rs6000/ppc-asm.h 2008-06-10 14:58:17.000000000 +0200
-@@ -158,7 +158,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.3.1/220-noteGNUstack-01.patch b/patches/gcc/4.3.1/220-noteGNUstack-01.patch
deleted file mode 100644
index a74e5e8..0000000
--- a/patches/gcc/4.3.1/220-noteGNUstack-01.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
-2005-02-08 Jakub Jelinek <jakub@redhat.com>
-
- * src/alpha/osf.S: Add .note.GNU-stack on Linux.
- * src/s390/sysv.S: Likewise.
- * src/powerpc/linux64.S: Likewise.
- * src/powerpc/linux64_closure.S: Likewise.
- * src/powerpc/ppc_closure.S: Likewise.
- * src/powerpc/sysv.S: Likewise.
- * src/x86/unix64.S: Likewise.
- * src/x86/sysv.S: Likewise.
- * src/sparc/v8.S: Likewise.
- * src/sparc/v9.S: Likewise.
- * src/m68k/sysv.S: Likewise.
- * src/ia64/unix.S: Likewise.
- * src/arm/sysv.S: Likewise.
-
- * ia64_save_regs_in_stack.s: Moved to...
- * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
- on Linux.
-
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S 2008-06-10 14:58:21.000000000 +0200
-@@ -0,0 +1,15 @@
-+ .text
-+ .align 16
-+ .global GC_save_regs_in_stack
-+ .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+ .bodyfoo.mpg
-+ flushrs
-+ ;;
-+ mov r8=ar.bsp
-+ br.ret.sptk.few rp
-+ .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s 2008-06-10 14:58:21.000000000 +0200
-@@ -1,12 +0,0 @@
-- .text
-- .align 16
-- .global GC_save_regs_in_stack
-- .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
-- .body
-- flushrs
-- ;;
-- mov r8=ar.bsp
-- br.ret.sptk.few rp
-- .endp GC_save_regs_in_stack
--
-diff -durN gcc-4.3.1.orig/libffi/src/alpha/osf.S gcc-4.3.1/libffi/src/alpha/osf.S
---- gcc-4.3.1.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
-+++ gcc-4.3.1/libffi/src/alpha/osf.S 2008-06-10 14:58:21.000000000 +0200
-@@ -358,4 +358,8 @@
- .byte 16 # uleb128 offset 16*-8
- .align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
- #endif
-diff -durN gcc-4.3.1.orig/libffi/src/arm/sysv.S gcc-4.3.1/libffi/src/arm/sysv.S
---- gcc-4.3.1.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
-+++ gcc-4.3.1/libffi/src/arm/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -293,3 +293,6 @@
- UNWIND .fnend
- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/ia64/unix.S gcc-4.3.1/libffi/src/ia64/unix.S
---- gcc-4.3.1.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
-+++ gcc-4.3.1/libffi/src/ia64/unix.S 2008-06-10 14:58:21.000000000 +0200
-@@ -553,3 +553,7 @@
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
- data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/m68k/sysv.S gcc-4.3.1/libffi/src/m68k/sysv.S
---- gcc-4.3.1.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
-+++ gcc-4.3.1/libffi/src/m68k/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -207,3 +207,7 @@
- rts
- CFI_ENDPROC()
- .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64.S gcc-4.3.1/libffi/src/powerpc/linux64.S
---- gcc-4.3.1.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/linux64.S 2008-06-10 14:58:21.000000000 +0200
-@@ -179,3 +179,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.1/libffi/src/powerpc/linux64_closure.S
---- gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
-+++ gcc-4.3.1/libffi/src/powerpc/linux64_closure.S 2008-06-10 14:58:21.000000000 +0200
-@@ -204,3 +204,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.1/libffi/src/powerpc/ppc_closure.S
---- gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/ppc_closure.S 2008-06-10 14:58:21.000000000 +0200
-@@ -295,3 +295,7 @@
- .LEFDE1:
-
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/sysv.S gcc-4.3.1/libffi/src/powerpc/sysv.S
---- gcc-4.3.1.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -223,3 +223,7 @@
- .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/s390/sysv.S gcc-4.3.1/libffi/src/s390/sysv.S
---- gcc-4.3.1.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
-+++ gcc-4.3.1/libffi/src/s390/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -427,3 +427,6 @@
-
- #endif
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/sparc/v8.S gcc-4.3.1/libffi/src/sparc/v8.S
---- gcc-4.3.1.orig/libffi/src/sparc/v8.S 2004-11-22 19:35:16.000000000 +0100
-+++ gcc-4.3.1/libffi/src/sparc/v8.S 2008-06-10 14:58:21.000000000 +0200
-@@ -265,3 +265,7 @@
- .byte 0x1f ! uleb128 0x1f
- .align WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/sparc/v9.S gcc-4.3.1/libffi/src/sparc/v9.S
---- gcc-4.3.1.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
-+++ gcc-4.3.1/libffi/src/sparc/v9.S 2008-06-10 14:58:21.000000000 +0200
-@@ -300,3 +300,7 @@
- .align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/x86/sysv.S gcc-4.3.1/libffi/src/x86/sysv.S
---- gcc-4.3.1.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
-+++ gcc-4.3.1/libffi/src/x86/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -430,3 +430,7 @@
- #endif
-
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/x86/unix64.S gcc-4.3.1/libffi/src/x86/unix64.S
---- gcc-4.3.1.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
-+++ gcc-4.3.1/libffi/src/x86/unix64.S 2008-06-10 14:58:21.000000000 +0200
-@@ -410,3 +410,7 @@
- .LEFDE3:
-
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc/4.3.1/230-pr34571.patch b/patches/gcc/4.3.1/230-pr34571.patch
deleted file mode 100644
index 16d0c30..0000000
--- a/patches/gcc/4.3.1/230-pr34571.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
-http://gcc.gnu.org/PR34571
-
-2007-12-26 Rask Ingemann Lambertsen <rask@sygehus.dk>
-
- PR target/34571
- * config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
- symbolic_operand.
- * varasm.c (output_constant_pool_1): Fix typo.
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.c gcc-4.3.1/gcc/config/alpha/alpha.c
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.c 2008-02-07 18:45:24.000000000 +0100
-+++ gcc-4.3.1/gcc/config/alpha/alpha.c 2008-06-10 14:58:24.000000000 +0200
-@@ -1113,8 +1113,7 @@
- static bool
- alpha_cannot_force_const_mem (rtx x)
- {
-- enum rtx_code code = GET_CODE (x);
-- return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
-+ return symbolic_operand (x, GET_MODE (x));
- }
-
- /* We do not allow indirect calls to be optimized into sibling calls, nor
-diff -durN gcc-4.3.1.orig/gcc/varasm.c gcc-4.3.1/gcc/varasm.c
---- gcc-4.3.1.orig/gcc/varasm.c 2007-12-05 22:55:10.000000000 +0100
-+++ gcc-4.3.1/gcc/varasm.c 2008-06-10 14:58:24.000000000 +0200
-@@ -3710,7 +3710,7 @@
- /* FALLTHRU */
-
- case LABEL_REF:
-- tmp = XEXP (x, 0);
-+ tmp = XEXP (tmp, 0);
- gcc_assert (!INSN_DELETED_P (tmp));
- gcc_assert (!NOTE_P (tmp)
- || NOTE_KIND (tmp) != NOTE_INSN_DELETED);
diff --git a/patches/gcc/4.3.1/240-pr25343.patch b/patches/gcc/4.3.1/240-pr25343.patch
deleted file mode 100644
index 776f607..0000000
--- a/patches/gcc/4.3.1/240-pr25343.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/66_all_gcc43-pr25343.patch
-http://gcc.gnu.org/PR25343
-
-sniped from Debian
-
-2008-04-27 Roman Zippel <zippel@linux-m68k.org>
-
- * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __mc68000__.
-
-diff -durN gcc-4.3.1.orig/gcc/config/host-linux.c gcc-4.3.1/gcc/config/host-linux.c
---- gcc-4.3.1.orig/gcc/config/host-linux.c 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/host-linux.c 2008-06-10 14:58:28.000000000 +0200
-@@ -84,6 +84,8 @@
- # define TRY_EMPTY_VM_SPACE 0x8000000000
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE 0x60000000
-+#elif defined(__mc68000__)
-+# define TRY_EMPTY_VM_SPACE 0x40000000
- #else
- # define TRY_EMPTY_VM_SPACE 0
- #endif
diff --git a/patches/gcc/4.3.1/250-sh-pr24836.patch b/patches/gcc/4.3.1/250-sh-pr24836.patch
deleted file mode 100644
index 753e264..0000000
--- a/patches/gcc/4.3.1/250-sh-pr24836.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/PR24836
-
-diff -durN gcc-4.3.1.orig/gcc/configure gcc-4.3.1/gcc/configure
---- gcc-4.3.1.orig/gcc/configure 2008-06-10 14:57:48.000000000 +0200
-+++ gcc-4.3.1/gcc/configure 2008-06-10 14:58:32.000000000 +0200
-@@ -14709,7 +14709,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.3.1.orig/gcc/configure.ac gcc-4.3.1/gcc/configure.ac
---- gcc-4.3.1.orig/gcc/configure.ac 2008-06-10 14:57:48.000000000 +0200
-+++ gcc-4.3.1/gcc/configure.ac 2008-06-10 14:58:32.000000000 +0200
-@@ -2537,7 +2537,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.3.1/260-uclibc-conf-noupstream.patch b/patches/gcc/4.3.1/260-uclibc-conf-noupstream.patch
deleted file mode 100644
index 5176968..0000000
--- a/patches/gcc/4.3.1/260-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-06-10 14:58:09.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-06-10 14:58:36.000000000 +0200
-@@ -2149,7 +2149,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.3.1/270-missing-execinfo_h.patch b/patches/gcc/4.3.1/270-missing-execinfo_h.patch
deleted file mode 100644
index fa749b2..0000000
--- a/patches/gcc/4.3.1/270-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_301-missing-execinfo_h.patch
-diff -durN gcc-4.3.1.orig/boehm-gc/include/gc.h gcc-4.3.1/boehm-gc/include/gc.h
---- gcc-4.3.1.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.3.1/boehm-gc/include/gc.h 2008-06-10 14:58:54.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.3.1/280-c99-complex-ugly-hack.patch b/patches/gcc/4.3.1/280-c99-complex-ugly-hack.patch
deleted file mode 100644
index 7aa36f8..0000000
--- a/patches/gcc/4.3.1/280-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
-diff -durN gcc-4.3.1.orig/libstdc++-v3/configure gcc-4.3.1/libstdc++-v3/configure
---- gcc-4.3.1.orig/libstdc++-v3/configure 2008-06-10 14:58:43.000000000 +0200
-+++ gcc-4.3.1/libstdc++-v3/configure 2008-06-10 14:58:58.000000000 +0200
-@@ -39006,6 +39006,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.3.1/290-index_macro.patch b/patches/gcc/4.3.1/290-index_macro.patch
deleted file mode 100644
index 65794aa..0000000
--- a/patches/gcc/4.3.1/290-index_macro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
-diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope
---- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope 2008-01-31 19:44:55.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/include/ext/rope 2008-06-10 14:59:02.000000000 +0200
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h 2008-06-10 14:59:02.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.3.1/300-libmudflap-susv3-legacy.patch b/patches/gcc/4.3.1/300-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 9672fc4..0000000
--- a/patches/gcc/4.3.1/300-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
-diff -durN gcc-4.3.1.orig/libmudflap/mf-hooks2.c gcc-4.3.1/libmudflap/mf-hooks2.c
---- gcc-4.3.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.3.1/libmudflap/mf-hooks2.c 2008-06-10 14:59:05.000000000 +0200
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.3.1/310-arm-softfloat.patch b/patches/gcc/4.3.1/310-arm-softfloat.patch
deleted file mode 100644
index 4e7ea7c..0000000
--- a/patches/gcc/4.3.1/310-arm-softfloat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.3.1.orig/gcc/config/arm/linux-elf.h gcc-4.3.1/gcc/config/arm/linux-elf.h
---- gcc-4.3.1.orig/gcc/config/arm/linux-elf.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.3.1/gcc/config/arm/linux-elf.h 2008-07-23 15:30:57.000000000 +0200
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-diff -durN gcc-4.3.1.orig/gcc/config/arm/t-linux gcc-4.3.1/gcc/config/arm/t-linux
---- gcc-4.3.1.orig/gcc/config/arm/t-linux 2006-11-09 23:14:27.000000000 +0100
-+++ gcc-4.3.1/gcc/config/arm/t-linux 2008-07-23 19:15:25.000000000 +0200
-@@ -3,7 +3,12 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
-+ _call_via_rX _interwork_call_via_rX \
-+ _lshrdi3 _ashrdi3 _ashldi3 \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc/4.3.1/320-alpha-signal_h.patch b/patches/gcc/4.3.1/320-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.3.1/320-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.3.1/330-unwind-for-uClibc.patch b/patches/gcc/4.3.1/330-unwind-for-uClibc.patch
deleted file mode 100644
index 55f7f39..0000000
--- a/patches/gcc/4.3.1/330-unwind-for-uClibc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.3.1.orig/gcc/config/t-linux-uclibc gcc-4.3.1/gcc/config/t-linux-uclibc
---- gcc-4.3.1.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.1/gcc/config/t-linux-uclibc 2008-07-29 13:07:15.000000000 +0200
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-07-29 13:11:02.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-07-29 13:10:05.000000000 +0200
-@@ -2651,6 +2651,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+ *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
diff --git a/patches/gcc/4.3.1/340-make-mno-spe-work-as-expected.patch b/patches/gcc/4.3.1/340-make-mno-spe-work-as-expected.patch
deleted file mode 100644
index c8c3291..0000000
--- a/patches/gcc/4.3.1/340-make-mno-spe-work-as-expected.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
- Nathan Sidwell <nathan@codesourcery.com>
-
- * config/rs6000/rs6000.opt (mspe): Remove Var property.
- (misel): Likewise.
- * config/rs6000/rs6000.h (rs6000_spe): Declare.
- (rs6000_isel): Likewise.
- * config/rs6000/rs6000.c (rs6000_spe): New variable.
- (rs6000_isel): New variable.
- (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
-
-Index: gcc/config/rs6000/rs6000.c
-===================================================================
---- a/gcc/config/rs6000/rs6000.c (revision 134642)
-+++ b/gcc/config/rs6000/rs6000.c (working copy)
-@@ -174,9 +174,15 @@ int rs6000_ieeequad;
- /* Nonzero to use AltiVec ABI. */
- int rs6000_altivec_abi;
-
-+/* Nonzero if we want SPE SIMD instructions. */
-+int rs6000_spe;
-+
- /* Nonzero if we want SPE ABI extensions. */
- int rs6000_spe_abi;
-
-+/* Nonzero to use isel instructions. */
-+int rs6000_isel;
-+
- /* Nonzero if floating point operations are done in the GPRs. */
- int rs6000_float_gprs = 0;
-
-@@ -2177,11 +2183,21 @@ rs6000_handle_option (size_t code, const
- rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
- break;
-
-+ case OPT_misel:
-+ rs6000_explicit_options.isel = true;
-+ rs6000_isel = value;
-+ break;
-+
- case OPT_misel_:
- rs6000_explicit_options.isel = true;
- rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
- break;
-
-+ case OPT_mspe:
-+ rs6000_explicit_options.spe = true;
-+ rs6000_spe = value;
-+ break;
-+
- case OPT_mspe_:
- rs6000_explicit_options.spe = true;
- rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
-Index: gcc/config/rs6000/rs6000.opt
-===================================================================
---- a/gcc/config/rs6000/rs6000.opt (revision 134642)
-+++ b/gcc/config/rs6000/rs6000.opt (working copy)
-@@ -190,7 +190,7 @@ Target RejectNegative Joined
- -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
-
- misel
--Target Var(rs6000_isel)
-+Target
- Generate isel instructions
-
- misel=
-@@ -198,7 +198,7 @@ Target RejectNegative Joined
- -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
-
- mspe
--Target Var(rs6000_spe)
-+Target
- Generate SPE SIMD instructions on E500
-
- mpaired
-Index: gcc/config/rs6000/rs6000.h
-===================================================================
---- a/gcc/config/rs6000/rs6000.h (revision 134642)
-+++ b/gcc/config/rs6000/rs6000.h (working copy)
-@@ -367,6 +367,8 @@ extern int rs6000_long_double_type_size;
- extern int rs6000_ieeequad;
- extern int rs6000_altivec_abi;
- extern int rs6000_spe_abi;
-+extern int rs6000_spe;
-+extern int rs6000_isel;
- extern int rs6000_float_gprs;
- extern int rs6000_alignment_flags;
- extern const char *rs6000_sched_insert_nops_str;
-
-
diff --git a/patches/gcc/4.3.1/350-sh-without-headers.patch b/patches/gcc/4.3.1/350-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.3.1/350-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.3.1/360-unbreak-armv4t.patch b/patches/gcc/4.3.1/360-unbreak-armv4t.patch
deleted file mode 100644
index af14e0d..0000000
--- a/patches/gcc/4.3.1/360-unbreak-armv4t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200
-+++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.3.1/370-libgcc_eh.a.patch b/patches/gcc/4.3.1/370-libgcc_eh.a.patch
deleted file mode 100644
index 1c263ae..0000000
--- a/patches/gcc/4.3.1/370-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.3.1.orig//libgcc/Makefile.in gcc-4.3.1/libgcc/Makefile.in
---- gcc-4.3.1.orig//libgcc/Makefile.in 2007-12-27 12:26:06.000000000 +0100
-+++ gcc-4.3.1/libgcc/Makefile.in 2011-09-02 12:21:23.781544679 +0200
-@@ -706,8 +706,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -876,10 +877,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -894,6 +891,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.3.2/100-alpha-mieee-default.patch b/patches/gcc/4.3.2/100-alpha-mieee-default.patch
deleted file mode 100644
index e449669..0000000
--- a/patches/gcc/4.3.2/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
-Set the default behavior on alpha to use -mieee since the large majority of
-time we want this (bad/weird things can happen with packages built without
--mieee).
-
-To satisfy those people who may not want -mieee forced on them all the time,
-we also provide -mno-ieee.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.h gcc-4.3.1/gcc/config/alpha/alpha.h
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.h 2007-12-06 14:25:37.000000000 +0100
-+++ gcc-4.3.1/gcc/config/alpha/alpha.h 2008-06-10 14:56:36.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.opt gcc-4.3.1/gcc/config/alpha/alpha.opt
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/alpha/alpha.opt 2008-06-10 14:56:36.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.3.2/110-trampolinewarn.patch b/patches/gcc/4.3.2/110-trampolinewarn.patch
deleted file mode 100644
index 7dcfe4d..0000000
--- a/patches/gcc/4.3.2/110-trampolinewarn.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-trampolinewarn.patch
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
-diff -durN gcc-4.3.1.orig/gcc/builtins.c gcc-4.3.1/gcc/builtins.c
---- gcc-4.3.1.orig/gcc/builtins.c 2008-04-23 00:36:27.000000000 +0200
-+++ gcc-4.3.1/gcc/builtins.c 2008-06-10 14:56:54.000000000 +0200
-@@ -5662,6 +5662,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.3.1.orig/gcc/common.opt gcc-4.3.1/gcc/common.opt
---- gcc-4.3.1.orig/gcc/common.opt 2008-01-22 15:11:44.000000000 +0100
-+++ gcc-4.3.1/gcc/common.opt 2008-06-10 14:56:54.000000000 +0200
-@@ -182,6 +182,10 @@
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.3.2/120-java-nomulti.patch b/patches/gcc/4.3.2/120-java-nomulti.patch
deleted file mode 100644
index ad43ce4..0000000
--- a/patches/gcc/4.3.2/120-java-nomulti.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
-diff -durN gcc-4.3.1.orig/libjava/configure gcc-4.3.1/libjava/configure
---- gcc-4.3.1.orig/libjava/configure 2008-06-06 16:49:11.000000000 +0200
-+++ gcc-4.3.1/libjava/configure 2008-06-10 14:57:38.000000000 +0200
-@@ -1018,6 +1018,8 @@
- --enable-gconf-peer compile GConf native peers for util.preferences
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1850,6 +1852,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
---- gcc-4.3.1.orig/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100
-+++ gcc-4.3.1/libjava/configure.ac 2008-06-10 14:57:38.000000000 +0200
-@@ -82,6 +82,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.3.2/130-cross-compile.patch b/patches/gcc/4.3.2/130-cross-compile.patch
deleted file mode 100644
index a69409f..0000000
--- a/patches/gcc/4.3.2/130-cross-compile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
-diff -durN gcc-4.3.2.orig/gcc/configure gcc-4.3.2/gcc/configure
---- gcc-4.3.2.orig/gcc/configure 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.2/gcc/configure 2008-09-23 19:39:43.000000000 +0200
-@@ -13442,7 +13442,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.2.orig/gcc/configure.ac gcc-4.3.2/gcc/configure.ac
---- gcc-4.3.2.orig/gcc/configure.ac 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.2/gcc/configure.ac 2008-09-23 19:39:43.000000000 +0200
-@@ -1749,7 +1749,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.2.orig/gcc/unwind-dw2.c gcc-4.3.2/gcc/unwind-dw2.c
---- gcc-4.3.2.orig/gcc/unwind-dw2.c 2007-07-25 20:14:57.000000000 +0200
-+++ gcc-4.3.2/gcc/unwind-dw2.c 2008-09-23 19:39:43.000000000 +0200
-@@ -334,9 +334,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.3.2/140-netbsd-symbolic.patch b/patches/gcc/4.3.2/140-netbsd-symbolic.patch
deleted file mode 100644
index d06a04a..0000000
--- a/patches/gcc/4.3.2/140-netbsd-symbolic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/11_all_gcc-netbsd-symbolic.patch
-http://bugs.gentoo.org/122698
-
-diff -durN gcc-4.3.1.orig/gcc/config/netbsd-elf.h gcc-4.3.1/gcc/config/netbsd-elf.h
---- gcc-4.3.1.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.3.1/gcc/config/netbsd-elf.h 2008-06-10 14:57:48.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.3.2/150-sparc64-bsd.patch b/patches/gcc/4.3.2/150-sparc64-bsd.patch
deleted file mode 100644
index 5ac2b43..0000000
--- a/patches/gcc/4.3.2/150-sparc64-bsd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/14_all_gcc-sparc64-bsd.patch
-diff -durN gcc-4.3.1.orig/gcc/config/sparc/freebsd.h gcc-4.3.1/gcc/config/sparc/freebsd.h
---- gcc-4.3.1.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/sparc/freebsd.h 2008-06-10 14:57:54.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.3.2/160-flatten-switch-stmt-00.patch b/patches/gcc/4.3.2/160-flatten-switch-stmt-00.patch
deleted file mode 100644
index 55cafcb..0000000
--- a/patches/gcc/4.3.2/160-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
-http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
-
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-diff -durN gcc-4.3.1.orig/gcc/stmt.c gcc-4.3.1/gcc/stmt.c
---- gcc-4.3.1.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
-+++ gcc-4.3.1/gcc/stmt.c 2008-06-10 14:57:58.000000000 +0200
-@@ -2509,7 +2509,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3067,6 +3071,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.3.2/170-libiberty-pic.patch b/patches/gcc/4.3.2/170-libiberty-pic.patch
deleted file mode 100644
index 0b1e6b4..0000000
--- a/patches/gcc/4.3.2/170-libiberty-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
-diff -durN gcc-4.3.1.orig/libiberty/Makefile.in gcc-4.3.1/libiberty/Makefile.in
---- gcc-4.3.1.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200
-+++ gcc-4.3.1/libiberty/Makefile.in 2008-06-10 14:58:02.000000000 +0200
-@@ -225,6 +225,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.3.2/180-superh-default-multilib.patch b/patches/gcc/4.3.2/180-superh-default-multilib.patch
deleted file mode 100644
index bc24221..0000000
--- a/patches/gcc/4.3.2/180-superh-default-multilib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
-The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-05-21 10:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-06-10 14:58:06.000000000 +0200
-@@ -2278,7 +2278,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.3.2/190-libstdc++-pic.patch b/patches/gcc/4.3.2/190-libstdc++-pic.patch
deleted file mode 100644
index 61cab19..0000000
--- a/patches/gcc/4.3.2/190-libstdc++-pic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch
-install libstdc++_pic.a if we have pic objs
-
-diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am gcc-4.3.1/libstdc++-v3/src/Makefile.am
---- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.am 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/src/Makefile.am 2008-06-10 14:58:09.000000000 +0200
-@@ -289,6 +289,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in gcc-4.3.1/libstdc++-v3/src/Makefile.in
---- gcc-4.3.1.orig/libstdc++-v3/src/Makefile.in 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/src/Makefile.in 2008-06-10 14:58:09.000000000 +0200
-@@ -693,7 +693,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -732,7 +732,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -858,6 +858,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.3.2/200-pr24170.patch b/patches/gcc/4.3.2/200-pr24170.patch
deleted file mode 100644
index cd13698..0000000
--- a/patches/gcc/4.3.2/200-pr24170.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
-http://gcc.gnu.org/PR24170
-
-2008-02-20 Tom Tromey <tromey@redhat.com>
-
- PR libgcj/24170:
- * java/io/natFilePosix.cc (File::performList): Don't use
- readdir_r.
- * configure, include/config.h.in: Rebuilt.
- * configure.ac: Don't check for readdir_r.
-
-diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
---- gcc-4.3.1.orig/libjava/configure.ac 2008-06-10 14:57:42.000000000 +0200
-+++ gcc-4.3.1/libjava/configure.ac 2008-06-10 14:58:13.000000000 +0200
-@@ -1030,7 +1030,7 @@
- PLATFORMNET=NoNet
- else
- AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
-- localtime_r readdir_r getpwuid_r getcwd \
-+ localtime_r getpwuid_r getcwd \
- access stat lstat mkdir rename rmdir unlink utime chmod readlink \
- nl_langinfo setlocale \
- inet_pton uname inet_ntoa \
-diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in
---- gcc-4.3.1.orig/libjava/include/config.h.in 2007-07-31 18:17:21.000000000 +0200
-+++ gcc-4.3.1/libjava/include/config.h.in 2008-06-10 14:58:13.000000000 +0200
-@@ -214,9 +214,6 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
-
--/* Define to 1 if you have the `readdir_r' function. */
--#undef HAVE_READDIR_R
--
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
-diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc
---- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc 2007-08-04 23:50:01.000000000 +0200
-+++ gcc-4.3.1/libjava/java/io/natFilePosix.cc 2008-06-10 14:58:13.000000000 +0200
-@@ -1,6 +1,6 @@
- // natFile.cc - Native part of File class for POSIX.
-
--/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
-+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
- Free Software Foundation
-
- This file is part of libgcj.
-@@ -292,13 +292,7 @@
-
- java::util::ArrayList *list = new java::util::ArrayList ();
- struct dirent *d;
--#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-- int name_max = pathconf (buf, _PC_NAME_MAX);
-- char dbuf[sizeof (struct dirent) + name_max + 1];
-- while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
--#else /* HAVE_READDIR_R */
- while ((d = readdir (dir)) != NULL)
--#endif /* HAVE_READDIR_R */
- {
- // Omit "." and "..".
- if (d->d_name[0] == '.'
diff --git a/patches/gcc/4.3.2/210-noteGNUstack-00.patch b/patches/gcc/4.3.2/210-noteGNUstack-00.patch
deleted file mode 100644
index d656661..0000000
--- a/patches/gcc/4.3.2/210-noteGNUstack-00.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
-2004-09-20 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
- on ppc64-linux.
-
- * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
- ia64-linux.
- * config/ia64/crtbegin.asm: Likewise.
- * config/ia64/crtend.asm: Likewise.
- * config/ia64/crti.asm: Likewise.
- * config/ia64/crtn.asm: Likewise.
-
-2004-05-14 Jakub Jelinek <jakub@redhat.com>
-
- * config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtbegin.asm gcc-4.3.1/gcc/config/ia64/crtbegin.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtbegin.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtbegin.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -255,3 +255,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtend.asm gcc-4.3.1/gcc/config/ia64/crtend.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtend.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtend.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -122,3 +122,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crti.asm gcc-4.3.1/gcc/config/ia64/crti.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crti.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crti.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -64,3 +64,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/crtn.asm gcc-4.3.1/gcc/config/ia64/crtn.asm
---- gcc-4.3.1.orig/gcc/config/ia64/crtn.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/crtn.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -54,3 +54,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/lib1funcs.asm gcc-4.3.1/gcc/config/ia64/lib1funcs.asm
---- gcc-4.3.1.orig/gcc/config/ia64/lib1funcs.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/lib1funcs.asm 2008-06-10 14:58:17.000000000 +0200
-@@ -792,3 +792,7 @@
- }
- .endp __floattitf
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.1.orig/gcc/config/ia64/linux.h gcc-4.3.1/gcc/config/ia64/linux.h
---- gcc-4.3.1.orig/gcc/config/ia64/linux.h 2006-12-12 16:15:19.000000000 +0100
-+++ gcc-4.3.1/gcc/config/ia64/linux.h 2008-06-10 14:58:17.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.3.1.orig/gcc/config/rs6000/ppc-asm.h gcc-4.3.1/gcc/config/rs6000/ppc-asm.h
---- gcc-4.3.1.orig/gcc/config/rs6000/ppc-asm.h 2003-06-04 18:44:51.000000000 +0200
-+++ gcc-4.3.1/gcc/config/rs6000/ppc-asm.h 2008-06-10 14:58:17.000000000 +0200
-@@ -158,7 +158,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.3.2/220-noteGNUstack-01.patch b/patches/gcc/4.3.2/220-noteGNUstack-01.patch
deleted file mode 100644
index ef8e85d..0000000
--- a/patches/gcc/4.3.2/220-noteGNUstack-01.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
-2005-02-08 Jakub Jelinek <jakub@redhat.com>
-
- * src/alpha/osf.S: Add .note.GNU-stack on Linux.
- * src/s390/sysv.S: Likewise.
- * src/powerpc/linux64.S: Likewise.
- * src/powerpc/linux64_closure.S: Likewise.
- * src/powerpc/ppc_closure.S: Likewise.
- * src/powerpc/sysv.S: Likewise.
- * src/x86/unix64.S: Likewise.
- * src/x86/sysv.S: Likewise.
- * src/sparc/v8.S: Likewise.
- * src/sparc/v9.S: Likewise.
- * src/m68k/sysv.S: Likewise.
- * src/ia64/unix.S: Likewise.
- * src/arm/sysv.S: Likewise.
-
- * ia64_save_regs_in_stack.s: Moved to...
- * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
- on Linux.
-
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S 2008-06-10 14:58:21.000000000 +0200
-@@ -0,0 +1,15 @@
-+ .text
-+ .align 16
-+ .global GC_save_regs_in_stack
-+ .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+ .bodyfoo.mpg
-+ flushrs
-+ ;;
-+ mov r8=ar.bsp
-+ br.ret.sptk.few rp
-+ .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s 1970-01-01 02:00:00.000000000 +0200
-@@ -1,12 +0,0 @@
-- .text
-- .align 16
-- .global GC_save_regs_in_stack
-- .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
-- .body
-- flushrs
-- ;;
-- mov r8=ar.bsp
-- br.ret.sptk.few rp
-- .endp GC_save_regs_in_stack
--
-diff -durN gcc-4.3.1.orig/libffi/src/alpha/osf.S gcc-4.3.1/libffi/src/alpha/osf.S
---- gcc-4.3.1.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
-+++ gcc-4.3.1/libffi/src/alpha/osf.S 2008-06-10 14:58:21.000000000 +0200
-@@ -358,4 +358,8 @@
- .byte 16 # uleb128 offset 16*-8
- .align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
- #endif
-diff -durN gcc-4.3.1.orig/libffi/src/arm/sysv.S gcc-4.3.1/libffi/src/arm/sysv.S
---- gcc-4.3.1.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
-+++ gcc-4.3.1/libffi/src/arm/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -293,3 +293,6 @@
- UNWIND .fnend
- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/ia64/unix.S gcc-4.3.1/libffi/src/ia64/unix.S
---- gcc-4.3.1.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
-+++ gcc-4.3.1/libffi/src/ia64/unix.S 2008-06-10 14:58:21.000000000 +0200
-@@ -553,3 +553,7 @@
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
- data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/m68k/sysv.S gcc-4.3.1/libffi/src/m68k/sysv.S
---- gcc-4.3.1.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
-+++ gcc-4.3.1/libffi/src/m68k/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -207,3 +207,7 @@
- rts
- CFI_ENDPROC()
- .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64.S gcc-4.3.1/libffi/src/powerpc/linux64.S
---- gcc-4.3.1.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/linux64.S 2008-06-10 14:58:21.000000000 +0200
-@@ -179,3 +179,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.1/libffi/src/powerpc/linux64_closure.S
---- gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
-+++ gcc-4.3.1/libffi/src/powerpc/linux64_closure.S 2008-06-10 14:58:21.000000000 +0200
-@@ -204,3 +204,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.1/libffi/src/powerpc/ppc_closure.S
---- gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/ppc_closure.S 2008-06-10 14:58:21.000000000 +0200
-@@ -295,3 +295,7 @@
- .LEFDE1:
-
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/powerpc/sysv.S gcc-4.3.1/libffi/src/powerpc/sysv.S
---- gcc-4.3.1.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.1/libffi/src/powerpc/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -223,3 +223,7 @@
- .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/s390/sysv.S gcc-4.3.1/libffi/src/s390/sysv.S
---- gcc-4.3.1.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
-+++ gcc-4.3.1/libffi/src/s390/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -427,3 +427,6 @@
-
- #endif
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/sparc/v8.S gcc-4.3.1/libffi/src/sparc/v8.S
---- gcc-4.3.1.orig/libffi/src/sparc/v8.S 2004-11-22 19:35:16.000000000 +0100
-+++ gcc-4.3.1/libffi/src/sparc/v8.S 2008-06-10 14:58:21.000000000 +0200
-@@ -265,3 +265,7 @@
- .byte 0x1f ! uleb128 0x1f
- .align WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/sparc/v9.S gcc-4.3.1/libffi/src/sparc/v9.S
---- gcc-4.3.1.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
-+++ gcc-4.3.1/libffi/src/sparc/v9.S 2008-06-10 14:58:21.000000000 +0200
-@@ -300,3 +300,7 @@
- .align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/x86/sysv.S gcc-4.3.1/libffi/src/x86/sysv.S
---- gcc-4.3.1.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
-+++ gcc-4.3.1/libffi/src/x86/sysv.S 2008-06-10 14:58:21.000000000 +0200
-@@ -430,3 +430,7 @@
- #endif
-
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/libffi/src/x86/unix64.S gcc-4.3.1/libffi/src/x86/unix64.S
---- gcc-4.3.1.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
-+++ gcc-4.3.1/libffi/src/x86/unix64.S 2008-06-10 14:58:21.000000000 +0200
-@@ -410,3 +410,7 @@
- .LEFDE3:
-
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc/4.3.2/230-pr34571.patch b/patches/gcc/4.3.2/230-pr34571.patch
deleted file mode 100644
index 16d0c30..0000000
--- a/patches/gcc/4.3.2/230-pr34571.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
-http://gcc.gnu.org/PR34571
-
-2007-12-26 Rask Ingemann Lambertsen <rask@sygehus.dk>
-
- PR target/34571
- * config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
- symbolic_operand.
- * varasm.c (output_constant_pool_1): Fix typo.
-
-diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.c gcc-4.3.1/gcc/config/alpha/alpha.c
---- gcc-4.3.1.orig/gcc/config/alpha/alpha.c 2008-02-07 18:45:24.000000000 +0100
-+++ gcc-4.3.1/gcc/config/alpha/alpha.c 2008-06-10 14:58:24.000000000 +0200
-@@ -1113,8 +1113,7 @@
- static bool
- alpha_cannot_force_const_mem (rtx x)
- {
-- enum rtx_code code = GET_CODE (x);
-- return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
-+ return symbolic_operand (x, GET_MODE (x));
- }
-
- /* We do not allow indirect calls to be optimized into sibling calls, nor
-diff -durN gcc-4.3.1.orig/gcc/varasm.c gcc-4.3.1/gcc/varasm.c
---- gcc-4.3.1.orig/gcc/varasm.c 2007-12-05 22:55:10.000000000 +0100
-+++ gcc-4.3.1/gcc/varasm.c 2008-06-10 14:58:24.000000000 +0200
-@@ -3710,7 +3710,7 @@
- /* FALLTHRU */
-
- case LABEL_REF:
-- tmp = XEXP (x, 0);
-+ tmp = XEXP (tmp, 0);
- gcc_assert (!INSN_DELETED_P (tmp));
- gcc_assert (!NOTE_P (tmp)
- || NOTE_KIND (tmp) != NOTE_INSN_DELETED);
diff --git a/patches/gcc/4.3.2/240-pr25343.patch b/patches/gcc/4.3.2/240-pr25343.patch
deleted file mode 100644
index 776f607..0000000
--- a/patches/gcc/4.3.2/240-pr25343.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/66_all_gcc43-pr25343.patch
-http://gcc.gnu.org/PR25343
-
-sniped from Debian
-
-2008-04-27 Roman Zippel <zippel@linux-m68k.org>
-
- * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __mc68000__.
-
-diff -durN gcc-4.3.1.orig/gcc/config/host-linux.c gcc-4.3.1/gcc/config/host-linux.c
---- gcc-4.3.1.orig/gcc/config/host-linux.c 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/host-linux.c 2008-06-10 14:58:28.000000000 +0200
-@@ -84,6 +84,8 @@
- # define TRY_EMPTY_VM_SPACE 0x8000000000
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE 0x60000000
-+#elif defined(__mc68000__)
-+# define TRY_EMPTY_VM_SPACE 0x40000000
- #else
- # define TRY_EMPTY_VM_SPACE 0
- #endif
diff --git a/patches/gcc/4.3.2/250-sh-pr24836.patch b/patches/gcc/4.3.2/250-sh-pr24836.patch
deleted file mode 100644
index 42b2b4c..0000000
--- a/patches/gcc/4.3.2/250-sh-pr24836.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/PR24836
-
-diff -durN gcc-4.3.2.orig/gcc/configure gcc-4.3.2/gcc/configure
---- gcc-4.3.2.orig/gcc/configure 2008-09-23 19:41:45.000000000 +0200
-+++ gcc-4.3.2/gcc/configure 2008-09-23 19:43:11.000000000 +0200
-@@ -20689,7 +20689,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.3.2.orig/gcc/configure.ac gcc-4.3.2/gcc/configure.ac
---- gcc-4.3.2.orig/gcc/configure.ac 2008-09-23 19:41:45.000000000 +0200
-+++ gcc-4.3.2/gcc/configure.ac 2008-09-23 19:43:11.000000000 +0200
-@@ -2552,7 +2552,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.3.2/260-uclibc-conf-noupstream.patch b/patches/gcc/4.3.2/260-uclibc-conf-noupstream.patch
deleted file mode 100644
index 5176968..0000000
--- a/patches/gcc/4.3.2/260-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-06-10 14:58:09.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-06-10 14:58:36.000000000 +0200
-@@ -2149,7 +2149,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.3.2/270-missing-execinfo_h.patch b/patches/gcc/4.3.2/270-missing-execinfo_h.patch
deleted file mode 100644
index fa749b2..0000000
--- a/patches/gcc/4.3.2/270-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_301-missing-execinfo_h.patch
-diff -durN gcc-4.3.1.orig/boehm-gc/include/gc.h gcc-4.3.1/boehm-gc/include/gc.h
---- gcc-4.3.1.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.3.1/boehm-gc/include/gc.h 2008-06-10 14:58:54.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.3.2/280-c99-complex-ugly-hack.patch b/patches/gcc/4.3.2/280-c99-complex-ugly-hack.patch
deleted file mode 100644
index 8462919..0000000
--- a/patches/gcc/4.3.2/280-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
-diff -durN gcc-4.3.2.orig/libstdc++-v3/configure gcc-4.3.2/libstdc++-v3/configure
---- gcc-4.3.2.orig/libstdc++-v3/configure 2008-07-07 21:49:54.000000000 +0200
-+++ gcc-4.3.2/libstdc++-v3/configure 2008-09-23 19:45:27.000000000 +0200
-@@ -38935,6 +38935,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.3.2/290-index_macro.patch b/patches/gcc/4.3.2/290-index_macro.patch
deleted file mode 100644
index 65794aa..0000000
--- a/patches/gcc/4.3.2/290-index_macro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
-diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope
---- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope 2008-01-31 19:44:55.000000000 +0100
-+++ gcc-4.3.1/libstdc++-v3/include/ext/rope 2008-06-10 14:59:02.000000000 +0200
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h 2008-06-10 14:59:02.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.3.2/300-libmudflap-susv3-legacy.patch b/patches/gcc/4.3.2/300-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 9672fc4..0000000
--- a/patches/gcc/4.3.2/300-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
-diff -durN gcc-4.3.1.orig/libmudflap/mf-hooks2.c gcc-4.3.1/libmudflap/mf-hooks2.c
---- gcc-4.3.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.3.1/libmudflap/mf-hooks2.c 2008-06-10 14:59:05.000000000 +0200
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.3.2/310-arm-softfloat.patch b/patches/gcc/4.3.2/310-arm-softfloat.patch
deleted file mode 100644
index 4e7ea7c..0000000
--- a/patches/gcc/4.3.2/310-arm-softfloat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.3.1.orig/gcc/config/arm/linux-elf.h gcc-4.3.1/gcc/config/arm/linux-elf.h
---- gcc-4.3.1.orig/gcc/config/arm/linux-elf.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.3.1/gcc/config/arm/linux-elf.h 2008-07-23 15:30:57.000000000 +0200
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-diff -durN gcc-4.3.1.orig/gcc/config/arm/t-linux gcc-4.3.1/gcc/config/arm/t-linux
---- gcc-4.3.1.orig/gcc/config/arm/t-linux 2006-11-09 23:14:27.000000000 +0100
-+++ gcc-4.3.1/gcc/config/arm/t-linux 2008-07-23 19:15:25.000000000 +0200
-@@ -3,7 +3,12 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
-+ _call_via_rX _interwork_call_via_rX \
-+ _lshrdi3 _ashrdi3 _ashldi3 \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc/4.3.2/320-alpha-signal_h.patch b/patches/gcc/4.3.2/320-alpha-signal_h.patch
deleted file mode 100644
index d7e1796..0000000
--- a/patches/gcc/4.3.2/320-alpha-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc-4.2.1-stock/gcc/config/alpha/linux-unwind.h 2005-06-24 20:22:41.000000000 -0500
-+++ gcc-4.2.1/gcc/config/alpha/linux-unwind.h 2007-09-01 20:21:34.000000000 -0500
-@@ -29,6 +29,9 @@ Boston, MA 02110-1301, USA. */
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@ alpha_fallback_frame_state (struct _Unwi
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.3.2/330-unwind-for-uClibc.patch b/patches/gcc/4.3.2/330-unwind-for-uClibc.patch
deleted file mode 100644
index 55f7f39..0000000
--- a/patches/gcc/4.3.2/330-unwind-for-uClibc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.3.1.orig/gcc/config/t-linux-uclibc gcc-4.3.1/gcc/config/t-linux-uclibc
---- gcc-4.3.1.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.1/gcc/config/t-linux-uclibc 2008-07-29 13:07:15.000000000 +0200
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1.orig/gcc/config.gcc 2008-07-29 13:11:02.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-07-29 13:10:05.000000000 +0200
-@@ -2651,6 +2651,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+ *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
diff --git a/patches/gcc/4.3.2/340-make-mno-spe-work-as-expected.patch b/patches/gcc/4.3.2/340-make-mno-spe-work-as-expected.patch
deleted file mode 100644
index bb702d5..0000000
--- a/patches/gcc/4.3.2/340-make-mno-spe-work-as-expected.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
- Nathan Sidwell <nathan@codesourcery.com>
-
- * config/rs6000/rs6000.opt (mspe): Remove Var property.
- (misel): Likewise.
- * config/rs6000/rs6000.h (rs6000_spe): Declare.
- (rs6000_isel): Likewise.
- * config/rs6000/rs6000.c (rs6000_spe): New variable.
- (rs6000_isel): New variable.
- (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
-
-diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.c gcc-4.3.2/gcc/config/rs6000/rs6000.c
---- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.c 2008-06-10 19:13:57.000000000 +0200
-+++ gcc-4.3.2/gcc/config/rs6000/rs6000.c 2008-09-23 19:46:45.000000000 +0200
-@@ -174,9 +174,15 @@
- /* Nonzero to use AltiVec ABI. */
- int rs6000_altivec_abi;
-
-+/* Nonzero if we want SPE SIMD instructions. */
-+int rs6000_spe;
-+
- /* Nonzero if we want SPE ABI extensions. */
- int rs6000_spe_abi;
-
-+/* Nonzero to use isel instructions. */
-+int rs6000_isel;
-+
- /* Nonzero if floating point operations are done in the GPRs. */
- int rs6000_float_gprs = 0;
-
-@@ -2144,11 +2150,21 @@
- rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
- break;
-
-+ case OPT_misel:
-+ rs6000_explicit_options.isel = true;
-+ rs6000_isel = value;
-+ break;
-+
- case OPT_misel_:
- rs6000_explicit_options.isel = true;
- rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
- break;
-
-+ case OPT_mspe:
-+ rs6000_explicit_options.spe = true;
-+ rs6000_spe = value;
-+ break;
-+
- case OPT_mspe_:
- rs6000_explicit_options.spe = true;
- rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
-diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.opt gcc-4.3.2/gcc/config/rs6000/rs6000.opt
---- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.opt 2007-10-31 08:56:01.000000000 +0100
-+++ gcc-4.3.2/gcc/config/rs6000/rs6000.opt 2008-09-23 19:46:45.000000000 +0200
-@@ -190,7 +190,7 @@
- -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
-
- misel
--Target Var(rs6000_isel)
-+Target
- Generate isel instructions
-
- misel=
-@@ -198,7 +198,7 @@
- -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
-
- mspe
--Target Var(rs6000_spe)
-+Target
- Generate SPE SIMD instructions on E500
-
- mpaired
-diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.h gcc-4.3.2/gcc/config/rs6000/rs6000.h
---- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.h 2008-01-26 18:18:35.000000000 +0100
-+++ gcc-4.3.2/gcc/config/rs6000/rs6000.h 2008-09-23 19:46:45.000000000 +0200
-@@ -349,6 +349,8 @@
- extern int rs6000_ieeequad;
- extern int rs6000_altivec_abi;
- extern int rs6000_spe_abi;
-+extern int rs6000_spe;
-+extern int rs6000_isel;
- extern int rs6000_float_gprs;
- extern int rs6000_alignment_flags;
- extern const char *rs6000_sched_insert_nops_str;
diff --git a/patches/gcc/4.3.2/350-sh-without-headers.patch b/patches/gcc/4.3.2/350-sh-without-headers.patch
deleted file mode 100644
index 07ddb65..0000000
--- a/patches/gcc/4.3.2/350-sh-without-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
-===================================================================
---- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h 2008-07-01 17:24:40.000000000 -0700
-+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h 2008-07-01 17:25:47.000000000 -0700
-@@ -26,6 +26,8 @@ along with this program; see the file CO
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
-
diff --git a/patches/gcc/4.3.2/360-fix-expensive-optimize.patch b/patches/gcc/4.3.2/360-fix-expensive-optimize.patch
deleted file mode 100644
index 699ac57..0000000
--- a/patches/gcc/4.3.2/360-fix-expensive-optimize.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-PR tree-optimization/32044
-
-From: rakdver
-Date: 2008-12-12 21:32:47 +0100
-
-* tree-scalar-evolution.h (expression_expensive_p): Declare.
-* tree-scalar-evolution.c (expression_expensive_p): New function.
-(scev_const_prop): Avoid introducing expensive expressions.
-* tree-ssa-loop-ivopts.c (may_eliminate_iv): Ditto.
-
-* gcc.dg/pr34027-1.c: Change outcome.
-* gcc.dg/tree-ssa/pr32044.c: New test.
-
-cherry picked from svn://gcc.gnu.org/svn/gcc/trunk, rev 142719 and adapted to
-apply on gcc 4.3.2
-
-------------------------------------------------------------------------
-Index: gcc-4.3.2/gcc/tree-scalar-evolution.c
-===================================================================
---- gcc-4.3.2.orig/gcc/tree-scalar-evolution.c 2009-01-28 10:14:37.000000000 +0100
-+++ gcc-4.3.2/gcc/tree-scalar-evolution.c 2009-01-28 10:17:50.000000000 +0100
-@@ -2716,6 +2716,50 @@
- scalar_evolution_info = NULL;
- }
-
-+/* Returns true if the expression EXPR is considered to be too expensive
-+ for scev_const_prop. */
-+
-+bool
-+expression_expensive_p (tree expr)
-+{
-+ enum tree_code code;
-+
-+ if (is_gimple_val (expr))
-+ return false;
-+
-+ code = TREE_CODE (expr);
-+ if (code == TRUNC_DIV_EXPR
-+ || code == CEIL_DIV_EXPR
-+ || code == FLOOR_DIV_EXPR
-+ || code == ROUND_DIV_EXPR
-+ || code == TRUNC_MOD_EXPR
-+ || code == CEIL_MOD_EXPR
-+ || code == FLOOR_MOD_EXPR
-+ || code == ROUND_MOD_EXPR
-+ || code == EXACT_DIV_EXPR)
-+ {
-+ /* Division by power of two is usually cheap, so we allow it.
-+ Forbid anything else. */
-+ if (!integer_pow2p (TREE_OPERAND (expr, 1)))
-+ return true;
-+ }
-+
-+ switch (TREE_CODE_CLASS (code))
-+ {
-+ case tcc_binary:
-+ case tcc_comparison:
-+ if (expression_expensive_p (TREE_OPERAND (expr, 1)))
-+ return true;
-+
-+ /* Fallthru. */
-+ case tcc_unary:
-+ return expression_expensive_p (TREE_OPERAND (expr, 0));
-+
-+ default:
-+ return true;
-+ }
-+}
-+
- /* Replace ssa names for that scev can prove they are constant by the
- appropriate constants. Also perform final value replacement in loops,
- in case the replacement expressions are cheap.
-@@ -2802,12 +2846,6 @@
- continue;
-
- niter = number_of_latch_executions (loop);
-- /* We used to check here whether the computation of NITER is expensive,
-- and avoided final value elimination if that is the case. The problem
-- is that it is hard to evaluate whether the expression is too
-- expensive, as we do not know what optimization opportunities the
-- the elimination of the final value may reveal. Therefore, we now
-- eliminate the final values of induction variables unconditionally. */
- if (niter == chrec_dont_know)
- continue;
-
-@@ -2838,7 +2876,15 @@
- /* Moving the computation from the loop may prolong life range
- of some ssa names, which may cause problems if they appear
- on abnormal edges. */
-- || contains_abnormal_ssa_name_p (def))
-+ || contains_abnormal_ssa_name_p (def)
-+ /* Do not emit expensive expressions. The rationale is that
-+ when someone writes a code like
-+
-+ while (n > 45) n -= 45;
-+
-+ he probably knows that n is not large, and does not want it
-+ to be turned into n %= 45. */
-+ || expression_expensive_p (def))
- continue;
-
- /* Eliminate the PHI node and replace it by a computation outside
-Index: gcc-4.3.2/gcc/tree-scalar-evolution.h
-===================================================================
---- gcc-4.3.2.orig/gcc/tree-scalar-evolution.h 2009-01-28 10:22:47.000000000 +0100
-+++ gcc-4.3.2/gcc/tree-scalar-evolution.h 2009-01-28 10:23:10.000000000 +0100
-@@ -35,6 +35,7 @@
- extern void scev_analysis (void);
- unsigned int scev_const_prop (void);
-
-+bool expression_expensive_p (tree);
- extern bool simple_iv (struct loop *, tree, tree, affine_iv *, bool);
-
- /* Returns the loop of the polynomial chrec CHREC. */
-Index: gcc-4.3.2/gcc/testsuite/gcc.dg/pr34027-1.c
-===================================================================
---- gcc-4.3.2.orig/gcc/testsuite/gcc.dg/pr34027-1.c 2009-01-28 10:24:09.000000000 +0100
-+++ gcc-4.3.2/gcc/testsuite/gcc.dg/pr34027-1.c 2009-01-28 10:24:43.000000000 +0100
-@@ -8,5 +8,9 @@
- return ns;
- }
-
--/* { dg-final { scan-tree-dump "ns % 10000" "optimized" } } */
-+/* This test was originally introduced to test that we transform
-+ to ns % 10000. See the discussion of PR 32044 why we do not do
-+ that anymore. */
-+/* { dg-final { scan-tree-dump-times "%" 0 "optimized" } } */
-+/* { dg-final { scan-tree-dump-times "/" 0 "optimized" } } */
- /* { dg-final { cleanup-tree-dump "optimized" } } */
-Index: gcc-4.3.2/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.3.2/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c 2009-01-28 10:25:50.000000000 +0100
-@@ -0,0 +1,55 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -fdump-tree-empty -fdump-tree-final_cleanup" } */
-+
-+int foo (int n)
-+{
-+ while (n >= 45)
-+ n -= 45;
-+
-+ return n;
-+}
-+
-+int bar (int n)
-+{
-+ while (n >= 64)
-+ n -= 64;
-+
-+ return n;
-+}
-+
-+int bla (int n)
-+{
-+ int i = 0;
-+
-+ while (n >= 45)
-+ {
-+ i++;
-+ n -= 45;
-+ }
-+
-+ return i;
-+}
-+
-+int baz (int n)
-+{
-+ int i = 0;
-+
-+ while (n >= 64)
-+ {
-+ i++;
-+ n -= 64;
-+ }
-+
-+ return i;
-+}
-+
-+/* The loops computing division/modulo by 64 should be eliminated. */
-+/* { dg-final { scan-tree-dump-times "Removing empty loop" 2 "empty" } } */
-+
-+/* There should be no division/modulo in the final dump (division and modulo
-+ by 64 are done using bit operations). */
-+/* { dg-final { scan-tree-dump-times "/" 0 "final_cleanup" } } */
-+/* { dg-final { scan-tree-dump-times "%" 0 "final_cleanup" } } */
-+
-+/* { dg-final { cleanup-tree-dump "empty" } } */
-+/* { dg-final { cleanup-tree-dump "final_cleanup" } } */
-Index: gcc-4.3.2/gcc/tree-ssa-loop-ivopts.c
-===================================================================
---- gcc-4.3.2.orig/gcc/tree-ssa-loop-ivopts.c 2009-01-28 10:26:04.000000000 +0100
-+++ gcc-4.3.2/gcc/tree-ssa-loop-ivopts.c 2009-01-28 10:27:09.000000000 +0100
-@@ -3778,7 +3778,12 @@
- return false;
-
- cand_value_at (loop, cand, use->stmt, nit, &bnd);
-+
- *bound = aff_combination_to_tree (&bnd);
-+ /* It is unlikely that computing the number of iterations using division
-+ would be more profitable than keeping the original induction variable. */
-+ if (expression_expensive_p (*bound))
-+ return false;
- return true;
- }
-
-
diff --git a/patches/gcc/4.3.2/370-sh-no-libc.patch b/patches/gcc/4.3.2/370-sh-no-libc.patch
deleted file mode 100644
index 1400748..0000000
--- a/patches/gcc/4.3.2/370-sh-no-libc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.3.2.orig/libgcc/config/sh/t-linux gcc-4.3.2/libgcc/config/sh/t-linux
---- gcc-4.3.2.orig/libgcc/config/sh/t-linux 2009-03-07 11:42:38.000000000 +0100
-+++ gcc-4.3.2/libgcc/config/sh/t-linux 2009-03-07 11:03:39.000000000 +0100
-@@ -15,7 +15,7 @@
- -Wl,--soname=@shlib_base_name@.so.1 \
- -Wl,--version-script=@shlib_map_file@ \
- -o @multilib_dir@/@shlib_base_name@.so.1.tmp @multilib_flags@ \
-- @shlib_objs@ -lc && \
-+ @shlib_objs@ && \
- rm -f @multilib_dir@/@shlib_base_name@.so && \
- if [ -f @multilib_dir@/@shlib_base_name@.so.1 ]; then \
- mv -f @multilib_dir@/@shlib_base_name@.so.1 \
diff --git a/patches/gcc/4.3.2/380-pr37436.patch b/patches/gcc/4.3.2/380-pr37436.patch
deleted file mode 100644
index 99a016f..0000000
--- a/patches/gcc/4.3.2/380-pr37436.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-gcc svn 142778:
-
-PR target/37436
-* arm.c (arm_legitimate_index): Only accept addresses that are in
-canonical form.
-* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
-* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
-for operand1.
-(extendqisi2): Likewise.
-(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
-predicate for operand1.
-
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
---- gcc-4.3.3.orig/gcc/config/arm/arm.c 2008-06-11 07:52:55.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.c 2009-05-21 16:06:45.000000000 -0300
-@@ -3769,6 +3769,7 @@
- rtx xop1 = XEXP (x, 1);
-
- return ((arm_address_register_rtx_p (xop0, strict_p)
-+ && GET_CODE(xop1) == CONST_INT
- && arm_legitimate_index_p (mode, xop1, outer, strict_p))
- || (arm_address_register_rtx_p (xop1, strict_p)
- && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
---- gcc-4.3.3.orig/gcc/config/arm/arm.md 2007-09-04 01:44:47.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.md 2009-05-21 16:06:45.000000000 -0300
-@@ -4199,7 +4199,7 @@
-
- (define_expand "extendqihi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:HI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4224,7 +4224,7 @@
-
- (define_insn "*arm_extendqihi_insn"
- [(set (match_operand:HI 0 "s_register_operand" "=r")
-- (sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4235,7 +4235,7 @@
-
- (define_expand "extendqisi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:SI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4267,7 +4267,7 @@
-
- (define_insn "*arm_extendqisi"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
-- (sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4 && !arm_arch6"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4278,7 +4278,8 @@
-
- (define_insn "*arm_extendqisi_v6"
- [(set (match_operand:SI 0 "s_register_operand" "=r,r")
-- (sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
-+ (sign_extend:SI
-+ (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
- "TARGET_ARM && arm_arch6"
- "@
- sxtb%?\\t%0, %1
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
---- gcc-4.3.3.orig/gcc/config/arm/predicates.md 2007-08-02 07:49:31.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/predicates.md 2009-05-21 16:06:45.000000000 -0300
-@@ -234,6 +234,10 @@
- (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
- 0)")))
-
-+(define_special_predicate "arm_reg_or_extendqisi_mem_op"
-+ (ior (match_operand 0 "arm_extendqisi_mem_op")
-+ (match_operand 0 "s_register_operand")))
-+
- (define_predicate "power_of_two_operand"
- (match_code "const_int")
- {
diff --git a/patches/gcc/4.3.2/390-unbreak-armv4t.patch b/patches/gcc/4.3.2/390-unbreak-armv4t.patch
deleted file mode 100644
index af14e0d..0000000
--- a/patches/gcc/4.3.2/390-unbreak-armv4t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200
-+++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.3.2/400-libgcc_eh.a.patch b/patches/gcc/4.3.2/400-libgcc_eh.a.patch
deleted file mode 100644
index 854198a..0000000
--- a/patches/gcc/4.3.2/400-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.3.2.orig//libgcc/Makefile.in gcc-4.3.2/libgcc/Makefile.in
---- gcc-4.3.2.orig//libgcc/Makefile.in 2008-06-17 11:32:34.000000000 +0200
-+++ gcc-4.3.2/libgcc/Makefile.in 2011-09-02 12:27:39.296538955 +0200
-@@ -705,8 +705,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -875,10 +876,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -893,6 +890,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.3.3/100-alpha-mieee-default.patch b/patches/gcc/4.3.3/100-alpha-mieee-default.patch
deleted file mode 100644
index 945019d..0000000
--- a/patches/gcc/4.3.3/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Original patch from: ../4.3.2/100-alpha-mieee-default.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
-Set the default behavior on alpha to use -mieee since the large majority of
-time we want this (bad/weird things can happen with packages built without
--mieee).
-
-To satisfy those people who may not want -mieee forced on them all the time,
-we also provide -mno-ieee.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.h gcc-4.3.3/gcc/config/alpha/alpha.h
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.h 2007-12-06 14:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config/alpha/alpha.h 2009-01-27 22:19:02.000000000 +0100
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.opt gcc-4.3.3/gcc/config/alpha/alpha.opt
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.opt 2009-01-27 22:19:02.000000000 +0100
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.3.3/110-trampolinewarn.patch b/patches/gcc/4.3.3/110-trampolinewarn.patch
deleted file mode 100644
index 43ab217..0000000
--- a/patches/gcc/4.3.3/110-trampolinewarn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Original patch from: ../4.3.2/110-trampolinewarn.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-trampolinewarn.patch
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/builtins.c gcc-4.3.3/gcc/builtins.c
---- gcc-4.3.3.orig/gcc/builtins.c 2008-08-19 18:37:13.000000000 +0200
-+++ gcc-4.3.3/gcc/builtins.c 2009-01-27 22:19:12.000000000 +0100
-@@ -5662,6 +5662,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.3.3.orig/gcc/common.opt gcc-4.3.3/gcc/common.opt
---- gcc-4.3.3.orig/gcc/common.opt 2008-01-22 15:11:44.000000000 +0100
-+++ gcc-4.3.3/gcc/common.opt 2009-01-27 22:19:12.000000000 +0100
-@@ -182,6 +182,10 @@
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.3.3/120-java-nomulti.patch b/patches/gcc/4.3.3/120-java-nomulti.patch
deleted file mode 100644
index 47b813e..0000000
--- a/patches/gcc/4.3.3/120-java-nomulti.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Original patch from: ../4.3.2/120-java-nomulti.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
---- gcc-4.3.3.orig/libjava/configure 2009-01-24 11:32:29.000000000 +0100
-+++ gcc-4.3.3/libjava/configure 2009-01-27 22:19:14.000000000 +0100
-@@ -1018,6 +1018,8 @@
- --enable-gconf-peer compile GConf native peers for util.preferences
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1850,6 +1852,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:14.000000000 +0100
-@@ -82,6 +82,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.3.3/130-cross-compile.patch b/patches/gcc/4.3.3/130-cross-compile.patch
deleted file mode 100644
index e265998..0000000
--- a/patches/gcc/4.3.3/130-cross-compile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Original patch from: ../4.3.2/130-cross-compile.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:19:16.000000000 +0100
-@@ -13442,7 +13442,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:19:16.000000000 +0100
-@@ -1749,7 +1749,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/unwind-dw2.c gcc-4.3.3/gcc/unwind-dw2.c
---- gcc-4.3.3.orig/gcc/unwind-dw2.c 2008-09-25 00:44:28.000000000 +0200
-+++ gcc-4.3.3/gcc/unwind-dw2.c 2009-01-27 22:19:16.000000000 +0100
-@@ -334,9 +334,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.3.3/140-netbsd-symbolic.patch b/patches/gcc/4.3.3/140-netbsd-symbolic.patch
deleted file mode 100644
index a899dd6..0000000
--- a/patches/gcc/4.3.3/140-netbsd-symbolic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/140-netbsd-symbolic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/11_all_gcc-netbsd-symbolic.patch
-http://bugs.gentoo.org/122698
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/netbsd-elf.h gcc-4.3.3/gcc/config/netbsd-elf.h
---- gcc-4.3.3.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.3.3/gcc/config/netbsd-elf.h 2009-01-27 22:19:18.000000000 +0100
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.3.3/150-sparc64-bsd.patch b/patches/gcc/4.3.3/150-sparc64-bsd.patch
deleted file mode 100644
index 233a763..0000000
--- a/patches/gcc/4.3.3/150-sparc64-bsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from: ../4.3.2/150-sparc64-bsd.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/14_all_gcc-sparc64-bsd.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sparc/freebsd.h gcc-4.3.3/gcc/config/sparc/freebsd.h
---- gcc-4.3.3.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sparc/freebsd.h 2009-01-27 22:19:20.000000000 +0100
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.3.3/160-flatten-switch-stmt-00.patch b/patches/gcc/4.3.3/160-flatten-switch-stmt-00.patch
deleted file mode 100644
index 82acfbc..0000000
--- a/patches/gcc/4.3.3/160-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Original patch from: ../4.3.2/160-flatten-switch-stmt-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
-http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
-
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c
---- gcc-4.3.3.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
-+++ gcc-4.3.3/gcc/stmt.c 2009-01-27 22:19:28.000000000 +0100
-@@ -2509,7 +2509,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3067,6 +3071,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.3.3/170-libiberty-pic.patch b/patches/gcc/4.3.3/170-libiberty-pic.patch
deleted file mode 100644
index 00789d0..0000000
--- a/patches/gcc/4.3.3/170-libiberty-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Original patch from: ../4.3.2/170-libiberty-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libiberty/Makefile.in gcc-4.3.3/libiberty/Makefile.in
---- gcc-4.3.3.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200
-+++ gcc-4.3.3/libiberty/Makefile.in 2009-01-27 22:19:30.000000000 +0100
-@@ -225,6 +225,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.3.3/180-superh-default-multilib.patch b/patches/gcc/4.3.3/180-superh-default-multilib.patch
deleted file mode 100644
index a419377..0000000
--- a/patches/gcc/4.3.3/180-superh-default-multilib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/180-superh-default-multilib.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
-The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2008-11-20 18:09:53.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:19:32.000000000 +0100
-@@ -2275,7 +2275,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.3.3/190-libstdc++-pic.patch b/patches/gcc/4.3.3/190-libstdc++-pic.patch
deleted file mode 100644
index d62847c..0000000
--- a/patches/gcc/4.3.3/190-libstdc++-pic.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch from: ../4.3.2/190-libstdc++-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch
-install libstdc++_pic.a if we have pic objs
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am gcc-4.3.3/libstdc++-v3/src/Makefile.am
---- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.3/libstdc++-v3/src/Makefile.am 2009-01-27 22:19:34.000000000 +0100
-@@ -289,6 +289,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in gcc-4.3.3/libstdc++-v3/src/Makefile.in
---- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.3/libstdc++-v3/src/Makefile.in 2009-01-27 22:19:34.000000000 +0100
-@@ -693,7 +693,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -732,7 +732,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -858,6 +858,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.3.3/200-pr24170.patch b/patches/gcc/4.3.3/200-pr24170.patch
deleted file mode 100644
index e2bbc9e..0000000
--- a/patches/gcc/4.3.3/200-pr24170.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Original patch from: ../4.3.2/200-pr24170.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
-http://gcc.gnu.org/PR24170
-
-2008-02-20 Tom Tromey <tromey@redhat.com>
-
- PR libgcj/24170:
- * java/io/natFilePosix.cc (File::performList): Don't use
- readdir_r.
- * configure, include/config.h.in: Rebuilt.
- * configure.ac: Don't check for readdir_r.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2009-01-27 22:19:16.000000000 +0100
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:36.000000000 +0100
-@@ -1030,7 +1030,7 @@
- PLATFORMNET=NoNet
- else
- AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
-- localtime_r readdir_r getpwuid_r getcwd \
-+ localtime_r getpwuid_r getcwd \
- access stat lstat mkdir rename rmdir unlink utime chmod readlink \
- nl_langinfo setlocale \
- inet_pton uname inet_ntoa \
-diff -durN gcc-4.3.3.orig/libjava/include/config.h.in gcc-4.3.3/libjava/include/config.h.in
---- gcc-4.3.3.orig/libjava/include/config.h.in 2007-07-31 18:17:21.000000000 +0200
-+++ gcc-4.3.3/libjava/include/config.h.in 2009-01-27 22:19:36.000000000 +0100
-@@ -214,9 +214,6 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
-
--/* Define to 1 if you have the `readdir_r' function. */
--#undef HAVE_READDIR_R
--
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
-diff -durN gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc gcc-4.3.3/libjava/java/io/natFilePosix.cc
---- gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc 2007-08-04 23:50:01.000000000 +0200
-+++ gcc-4.3.3/libjava/java/io/natFilePosix.cc 2009-01-27 22:19:36.000000000 +0100
-@@ -1,6 +1,6 @@
- // natFile.cc - Native part of File class for POSIX.
-
--/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
-+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
- Free Software Foundation
-
- This file is part of libgcj.
-@@ -292,13 +292,7 @@
-
- java::util::ArrayList *list = new java::util::ArrayList ();
- struct dirent *d;
--#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-- int name_max = pathconf (buf, _PC_NAME_MAX);
-- char dbuf[sizeof (struct dirent) + name_max + 1];
-- while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
--#else /* HAVE_READDIR_R */
- while ((d = readdir (dir)) != NULL)
--#endif /* HAVE_READDIR_R */
- {
- // Omit "." and "..".
- if (d->d_name[0] == '.'
diff --git a/patches/gcc/4.3.3/210-noteGNUstack-00.patch b/patches/gcc/4.3.3/210-noteGNUstack-00.patch
deleted file mode 100644
index 84c6424..0000000
--- a/patches/gcc/4.3.3/210-noteGNUstack-00.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Original patch from: ../4.3.2/210-noteGNUstack-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
-2004-09-20 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
- on ppc64-linux.
-
- * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
- ia64-linux.
- * config/ia64/crtbegin.asm: Likewise.
- * config/ia64/crtend.asm: Likewise.
- * config/ia64/crti.asm: Likewise.
- * config/ia64/crtn.asm: Likewise.
-
-2004-05-14 Jakub Jelinek <jakub@redhat.com>
-
- * config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm gcc-4.3.3/gcc/config/ia64/crtbegin.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtbegin.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -255,3 +255,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtend.asm gcc-4.3.3/gcc/config/ia64/crtend.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtend.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtend.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -122,3 +122,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crti.asm gcc-4.3.3/gcc/config/ia64/crti.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crti.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crti.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -64,3 +64,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtn.asm gcc-4.3.3/gcc/config/ia64/crtn.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtn.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtn.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -54,3 +54,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm gcc-4.3.3/gcc/config/ia64/lib1funcs.asm
---- gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/lib1funcs.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -792,3 +792,7 @@
- }
- .endp __floattitf
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 16:15:19.000000000 +0100
-+++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-27 22:19:39.000000000 +0100
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h gcc-4.3.3/gcc/config/rs6000/ppc-asm.h
---- gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h 2003-06-04 18:44:51.000000000 +0200
-+++ gcc-4.3.3/gcc/config/rs6000/ppc-asm.h 2009-01-27 22:19:39.000000000 +0100
-@@ -158,7 +158,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.3.3/220-noteGNUstack-01.patch b/patches/gcc/4.3.3/220-noteGNUstack-01.patch
deleted file mode 100644
index cb6e999..0000000
--- a/patches/gcc/4.3.3/220-noteGNUstack-01.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Original patch from: ../4.3.2/220-noteGNUstack-01.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
-2005-02-08 Jakub Jelinek <jakub@redhat.com>
-
- * src/alpha/osf.S: Add .note.GNU-stack on Linux.
- * src/s390/sysv.S: Likewise.
- * src/powerpc/linux64.S: Likewise.
- * src/powerpc/linux64_closure.S: Likewise.
- * src/powerpc/ppc_closure.S: Likewise.
- * src/powerpc/sysv.S: Likewise.
- * src/x86/unix64.S: Likewise.
- * src/x86/sysv.S: Likewise.
- * src/sparc/v8.S: Likewise.
- * src/sparc/v9.S: Likewise.
- * src/m68k/sysv.S: Likewise.
- * src/ia64/unix.S: Likewise.
- * src/arm/sysv.S: Likewise.
-
- * ia64_save_regs_in_stack.s: Moved to...
- * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
- on Linux.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S 2009-01-27 22:25:27.000000000 +0100
-@@ -0,0 +1,15 @@
-+ .text
-+ .align 16
-+ .global GC_save_regs_in_stack
-+ .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+ .bodyfoo.mpg
-+ flushrs
-+ ;;
-+ mov r8=ar.bsp
-+ br.ret.sptk.few rp
-+ .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
-- .text
-- .align 16
-- .global GC_save_regs_in_stack
-- .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
-- .body
-- flushrs
-- ;;
-- mov r8=ar.bsp
-- br.ret.sptk.few rp
-- .endp GC_save_regs_in_stack
--
-diff -durN gcc-4.3.3.orig/libffi/src/alpha/osf.S gcc-4.3.3/libffi/src/alpha/osf.S
---- gcc-4.3.3.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
-+++ gcc-4.3.3/libffi/src/alpha/osf.S 2009-01-27 22:25:27.000000000 +0100
-@@ -358,4 +358,8 @@
- .byte 16 # uleb128 offset 16*-8
- .align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
- #endif
-diff -durN gcc-4.3.3.orig/libffi/src/arm/sysv.S gcc-4.3.3/libffi/src/arm/sysv.S
---- gcc-4.3.3.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
-+++ gcc-4.3.3/libffi/src/arm/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -293,3 +293,6 @@
- UNWIND .fnend
- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/ia64/unix.S gcc-4.3.3/libffi/src/ia64/unix.S
---- gcc-4.3.3.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
-+++ gcc-4.3.3/libffi/src/ia64/unix.S 2009-01-27 22:25:27.000000000 +0100
-@@ -553,3 +553,7 @@
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
- data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/m68k/sysv.S gcc-4.3.3/libffi/src/m68k/sysv.S
---- gcc-4.3.3.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
-+++ gcc-4.3.3/libffi/src/m68k/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -207,3 +207,7 @@
- rts
- CFI_ENDPROC()
- .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64.S gcc-4.3.3/libffi/src/powerpc/linux64.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/linux64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -179,3 +179,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.3/libffi/src/powerpc/linux64_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
-+++ gcc-4.3.3/libffi/src/powerpc/linux64_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -204,3 +204,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.3/libffi/src/powerpc/ppc_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/ppc_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -295,3 +295,7 @@
- .LEFDE1:
-
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/sysv.S gcc-4.3.3/libffi/src/powerpc/sysv.S
---- gcc-4.3.3.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -223,3 +223,7 @@
- .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/s390/sysv.S gcc-4.3.3/libffi/src/s390/sysv.S
---- gcc-4.3.3.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
-+++ gcc-4.3.3/libffi/src/s390/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -427,3 +427,6 @@
-
- #endif
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v8.S gcc-4.3.3/libffi/src/sparc/v8.S
---- gcc-4.3.3.orig/libffi/src/sparc/v8.S 2008-11-21 23:13:13.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v8.S 2009-01-27 22:25:27.000000000 +0100
-@@ -306,3 +306,7 @@
- .byte 0x1f ! uleb128 0x1f
- .align WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v9.S gcc-4.3.3/libffi/src/sparc/v9.S
---- gcc-4.3.3.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v9.S 2009-01-27 22:25:27.000000000 +0100
-@@ -300,3 +300,7 @@
- .align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/sysv.S gcc-4.3.3/libffi/src/x86/sysv.S
---- gcc-4.3.3.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
-+++ gcc-4.3.3/libffi/src/x86/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -430,3 +430,7 @@
- #endif
-
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/unix64.S gcc-4.3.3/libffi/src/x86/unix64.S
---- gcc-4.3.3.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
-+++ gcc-4.3.3/libffi/src/x86/unix64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -410,3 +410,7 @@
- .LEFDE3:
-
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc/4.3.3/230-pr34571.patch b/patches/gcc/4.3.3/230-pr34571.patch
deleted file mode 100644
index c28a1cc..0000000
--- a/patches/gcc/4.3.3/230-pr34571.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Original patch from: ../4.3.2/230-pr34571.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
-http://gcc.gnu.org/PR34571
-
-2007-12-26 Rask Ingemann Lambertsen <rask@sygehus.dk>
-
- PR target/34571
- * config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
- symbolic_operand.
- * varasm.c (output_constant_pool_1): Fix typo.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.c 2008-09-09 01:16:55.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.c 2009-01-27 22:25:29.000000000 +0100
-@@ -1113,8 +1113,7 @@
- static bool
- alpha_cannot_force_const_mem (rtx x)
- {
-- enum rtx_code code = GET_CODE (x);
-- return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
-+ return symbolic_operand (x, GET_MODE (x));
- }
-
- /* We do not allow indirect calls to be optimized into sibling calls, nor
diff --git a/patches/gcc/4.3.3/240-pr25343.patch b/patches/gcc/4.3.3/240-pr25343.patch
deleted file mode 100644
index 07d6318..0000000
--- a/patches/gcc/4.3.3/240-pr25343.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Original patch from: ../4.3.2/240-pr25343.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/66_all_gcc43-pr25343.patch
-http://gcc.gnu.org/PR25343
-
-sniped from Debian
-
-2008-04-27 Roman Zippel <zippel@linux-m68k.org>
-
- * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __mc68000__.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/host-linux.c gcc-4.3.3/gcc/config/host-linux.c
---- gcc-4.3.3.orig/gcc/config/host-linux.c 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/host-linux.c 2009-01-27 22:25:31.000000000 +0100
-@@ -84,6 +84,8 @@
- # define TRY_EMPTY_VM_SPACE 0x8000000000
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE 0x60000000
-+#elif defined(__mc68000__)
-+# define TRY_EMPTY_VM_SPACE 0x40000000
- #else
- # define TRY_EMPTY_VM_SPACE 0
- #endif
diff --git a/patches/gcc/4.3.3/250-sh-pr24836.patch b/patches/gcc/4.3.3/250-sh-pr24836.patch
deleted file mode 100644
index 1528b35..0000000
--- a/patches/gcc/4.3.3/250-sh-pr24836.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Original patch from: ../4.3.2/250-sh-pr24836.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/PR24836
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:25:33.000000000 +0100
-@@ -20689,7 +20689,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:25:33.000000000 +0100
-@@ -2552,7 +2552,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.3.3/260-uclibc-conf-noupstream.patch b/patches/gcc/4.3.3/260-uclibc-conf-noupstream.patch
deleted file mode 100644
index c046030..0000000
--- a/patches/gcc/4.3.3/260-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/260-uclibc-conf-noupstream.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:19:34.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:25:35.000000000 +0100
-@@ -2146,7 +2146,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.3.3/270-missing-execinfo_h.patch b/patches/gcc/4.3.3/270-missing-execinfo_h.patch
deleted file mode 100644
index 8f36f45..0000000
--- a/patches/gcc/4.3.3/270-missing-execinfo_h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/270-missing-execinfo_h.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_301-missing-execinfo_h.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/include/gc.h gcc-4.3.3/boehm-gc/include/gc.h
---- gcc-4.3.3.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/include/gc.h 2009-01-27 22:25:37.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.3.3/280-c99-complex-ugly-hack.patch b/patches/gcc/4.3.3/280-c99-complex-ugly-hack.patch
deleted file mode 100644
index 7588647..0000000
--- a/patches/gcc/4.3.3/280-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/280-c99-complex-ugly-hack.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
---- gcc-4.3.3.orig/libstdc++-v3/configure 2008-07-07 21:49:54.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/configure 2009-01-27 22:25:39.000000000 +0100
-@@ -38935,6 +38935,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.3.3/290-index_macro.patch b/patches/gcc/4.3.3/290-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.3.3/290-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.3.3/300-libmudflap-susv3-legacy.patch b/patches/gcc/4.3.3/300-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 7b20da9..0000000
--- a/patches/gcc/4.3.3/300-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Original patch from: ../4.3.2/300-libmudflap-susv3-legacy.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libmudflap/mf-hooks2.c gcc-4.3.3/libmudflap/mf-hooks2.c
---- gcc-4.3.3.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.3.3/libmudflap/mf-hooks2.c 2009-01-27 22:25:45.000000000 +0100
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.3.3/310-arm-softfloat.patch b/patches/gcc/4.3.3/310-arm-softfloat.patch
deleted file mode 100644
index 60de45f..0000000
--- a/patches/gcc/4.3.3/310-arm-softfloat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Original patch from: ../4.3.2/310-arm-softfloat.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-27 22:25:47.000000000 +0100
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/t-linux gcc-4.3.3/gcc/config/arm/t-linux
---- gcc-4.3.3.orig/gcc/config/arm/t-linux 2006-11-09 23:14:27.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/t-linux 2009-01-27 22:25:47.000000000 +0100
-@@ -3,7 +3,12 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
-+ _call_via_rX _interwork_call_via_rX \
-+ _lshrdi3 _ashrdi3 _ashldi3 \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc/4.3.3/320-alpha-signal_h.patch b/patches/gcc/4.3.3/320-alpha-signal_h.patch
deleted file mode 100644
index 2f4df3e..0000000
--- a/patches/gcc/4.3.3/320-alpha-signal_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Original patch from: ../4.3.2/320-alpha-signal_h.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.3.3/gcc/config/alpha/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h 2006-10-26 21:31:09.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/linux-unwind.h 2009-01-27 22:25:49.000000000 +0100
-@@ -29,6 +29,9 @@
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.3.3/330-unwind-for-uClibc.patch b/patches/gcc/4.3.3/330-unwind-for-uClibc.patch
deleted file mode 100644
index ac97c2f..0000000
--- a/patches/gcc/4.3.3/330-unwind-for-uClibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/330-unwind-for-uClibc.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/t-linux-uclibc gcc-4.3.3/gcc/config/t-linux-uclibc
---- gcc-4.3.3.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/gcc/config/t-linux-uclibc 2009-01-27 22:28:53.000000000 +0100
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:28:53.000000000 +0100
-@@ -2648,6 +2648,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+ *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
diff --git a/patches/gcc/4.3.3/340-make-mno-spe-work-as-expected.patch b/patches/gcc/4.3.3/340-make-mno-spe-work-as-expected.patch
deleted file mode 100644
index ad2d203..0000000
--- a/patches/gcc/4.3.3/340-make-mno-spe-work-as-expected.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Original patch from: ../4.3.2/340-make-mno-spe-work-as-expected.patch
-
--= BEGIN original header =-
-2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
- Nathan Sidwell <nathan@codesourcery.com>
-
- * config/rs6000/rs6000.opt (mspe): Remove Var property.
- (misel): Likewise.
- * config/rs6000/rs6000.h (rs6000_spe): Declare.
- (rs6000_isel): Likewise.
- * config/rs6000/rs6000.c (rs6000_spe): New variable.
- (rs6000_isel): New variable.
- (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c gcc-4.3.3/gcc/config/rs6000/rs6000.c
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c 2008-11-18 23:07:58.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.c 2009-01-27 22:28:55.000000000 +0100
-@@ -174,9 +174,15 @@
- /* Nonzero to use AltiVec ABI. */
- int rs6000_altivec_abi;
-
-+/* Nonzero if we want SPE SIMD instructions. */
-+int rs6000_spe;
-+
- /* Nonzero if we want SPE ABI extensions. */
- int rs6000_spe_abi;
-
-+/* Nonzero to use isel instructions. */
-+int rs6000_isel;
-+
- /* Nonzero if floating point operations are done in the GPRs. */
- int rs6000_float_gprs = 0;
-
-@@ -2144,11 +2150,21 @@
- rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
- break;
-
-+ case OPT_misel:
-+ rs6000_explicit_options.isel = true;
-+ rs6000_isel = value;
-+ break;
-+
- case OPT_misel_:
- rs6000_explicit_options.isel = true;
- rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
- break;
-
-+ case OPT_mspe:
-+ rs6000_explicit_options.spe = true;
-+ rs6000_spe = value;
-+ break;
-+
- case OPT_mspe_:
- rs6000_explicit_options.spe = true;
- rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h gcc-4.3.3/gcc/config/rs6000/rs6000.h
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h 2008-01-26 18:18:35.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.h 2009-01-27 22:28:55.000000000 +0100
-@@ -349,6 +349,8 @@
- extern int rs6000_ieeequad;
- extern int rs6000_altivec_abi;
- extern int rs6000_spe_abi;
-+extern int rs6000_spe;
-+extern int rs6000_isel;
- extern int rs6000_float_gprs;
- extern int rs6000_alignment_flags;
- extern const char *rs6000_sched_insert_nops_str;
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt gcc-4.3.3/gcc/config/rs6000/rs6000.opt
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt 2007-10-31 08:56:01.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.opt 2009-01-27 22:28:55.000000000 +0100
-@@ -190,7 +190,7 @@
- -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
-
- misel
--Target Var(rs6000_isel)
-+Target
- Generate isel instructions
-
- misel=
-@@ -198,7 +198,7 @@
- -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
-
- mspe
--Target Var(rs6000_spe)
-+Target
- Generate SPE SIMD instructions on E500
-
- mpaired
diff --git a/patches/gcc/4.3.3/350-sh-without-headers.patch b/patches/gcc/4.3.3/350-sh-without-headers.patch
deleted file mode 100644
index 0bb860d..0000000
--- a/patches/gcc/4.3.3/350-sh-without-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Original patch from: ../4.3.2/350-sh-without-headers.patch
-
--= BEGIN original header =-
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h gcc-4.3.3/gcc/config/sh/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h 2007-09-12 08:59:06.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sh/linux-unwind.h 2009-01-27 22:28:57.000000000 +0100
-@@ -26,6 +26,8 @@
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
diff --git a/patches/gcc/4.3.3/380-pr37436.patch b/patches/gcc/4.3.3/380-pr37436.patch
deleted file mode 100644
index 99a016f..0000000
--- a/patches/gcc/4.3.3/380-pr37436.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-gcc svn 142778:
-
-PR target/37436
-* arm.c (arm_legitimate_index): Only accept addresses that are in
-canonical form.
-* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
-* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
-for operand1.
-(extendqisi2): Likewise.
-(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
-predicate for operand1.
-
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
---- gcc-4.3.3.orig/gcc/config/arm/arm.c 2008-06-11 07:52:55.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.c 2009-05-21 16:06:45.000000000 -0300
-@@ -3769,6 +3769,7 @@
- rtx xop1 = XEXP (x, 1);
-
- return ((arm_address_register_rtx_p (xop0, strict_p)
-+ && GET_CODE(xop1) == CONST_INT
- && arm_legitimate_index_p (mode, xop1, outer, strict_p))
- || (arm_address_register_rtx_p (xop1, strict_p)
- && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
---- gcc-4.3.3.orig/gcc/config/arm/arm.md 2007-09-04 01:44:47.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.md 2009-05-21 16:06:45.000000000 -0300
-@@ -4199,7 +4199,7 @@
-
- (define_expand "extendqihi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:HI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4224,7 +4224,7 @@
-
- (define_insn "*arm_extendqihi_insn"
- [(set (match_operand:HI 0 "s_register_operand" "=r")
-- (sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4235,7 +4235,7 @@
-
- (define_expand "extendqisi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:SI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4267,7 +4267,7 @@
-
- (define_insn "*arm_extendqisi"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
-- (sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4 && !arm_arch6"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4278,7 +4278,8 @@
-
- (define_insn "*arm_extendqisi_v6"
- [(set (match_operand:SI 0 "s_register_operand" "=r,r")
-- (sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
-+ (sign_extend:SI
-+ (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
- "TARGET_ARM && arm_arch6"
- "@
- sxtb%?\\t%0, %1
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
---- gcc-4.3.3.orig/gcc/config/arm/predicates.md 2007-08-02 07:49:31.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/predicates.md 2009-05-21 16:06:45.000000000 -0300
-@@ -234,6 +234,10 @@
- (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
- 0)")))
-
-+(define_special_predicate "arm_reg_or_extendqisi_mem_op"
-+ (ior (match_operand 0 "arm_extendqisi_mem_op")
-+ (match_operand 0 "s_register_operand")))
-+
- (define_predicate "power_of_two_operand"
- (match_code "const_int")
- {
diff --git a/patches/gcc/4.3.3/390-unbreak-armv4t.patch b/patches/gcc/4.3.3/390-unbreak-armv4t.patch
deleted file mode 100644
index af14e0d..0000000
--- a/patches/gcc/4.3.3/390-unbreak-armv4t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200
-+++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.3.3/400-libgcc_eh.a.patch b/patches/gcc/4.3.3/400-libgcc_eh.a.patch
deleted file mode 100644
index 854198a..0000000
--- a/patches/gcc/4.3.3/400-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.3.2.orig//libgcc/Makefile.in gcc-4.3.2/libgcc/Makefile.in
---- gcc-4.3.2.orig//libgcc/Makefile.in 2008-06-17 11:32:34.000000000 +0200
-+++ gcc-4.3.2/libgcc/Makefile.in 2011-09-02 12:27:39.296538955 +0200
-@@ -705,8 +705,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -875,10 +876,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -893,6 +890,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.3.4/100-alpha-mieee-default.patch b/patches/gcc/4.3.4/100-alpha-mieee-default.patch
deleted file mode 100644
index 945019d..0000000
--- a/patches/gcc/4.3.4/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Original patch from: ../4.3.2/100-alpha-mieee-default.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
-Set the default behavior on alpha to use -mieee since the large majority of
-time we want this (bad/weird things can happen with packages built without
--mieee).
-
-To satisfy those people who may not want -mieee forced on them all the time,
-we also provide -mno-ieee.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.h gcc-4.3.3/gcc/config/alpha/alpha.h
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.h 2007-12-06 14:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config/alpha/alpha.h 2009-01-27 22:19:02.000000000 +0100
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.opt gcc-4.3.3/gcc/config/alpha/alpha.opt
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.opt 2009-01-27 22:19:02.000000000 +0100
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.3.4/110-trampolinewarn.patch b/patches/gcc/4.3.4/110-trampolinewarn.patch
deleted file mode 100644
index 43ab217..0000000
--- a/patches/gcc/4.3.4/110-trampolinewarn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Original patch from: ../4.3.2/110-trampolinewarn.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-trampolinewarn.patch
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/builtins.c gcc-4.3.3/gcc/builtins.c
---- gcc-4.3.3.orig/gcc/builtins.c 2008-08-19 18:37:13.000000000 +0200
-+++ gcc-4.3.3/gcc/builtins.c 2009-01-27 22:19:12.000000000 +0100
-@@ -5662,6 +5662,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.3.3.orig/gcc/common.opt gcc-4.3.3/gcc/common.opt
---- gcc-4.3.3.orig/gcc/common.opt 2008-01-22 15:11:44.000000000 +0100
-+++ gcc-4.3.3/gcc/common.opt 2009-01-27 22:19:12.000000000 +0100
-@@ -182,6 +182,10 @@
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.3.4/120-java-nomulti.patch b/patches/gcc/4.3.4/120-java-nomulti.patch
deleted file mode 100644
index 47b813e..0000000
--- a/patches/gcc/4.3.4/120-java-nomulti.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Original patch from: ../4.3.2/120-java-nomulti.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
---- gcc-4.3.3.orig/libjava/configure 2009-01-24 11:32:29.000000000 +0100
-+++ gcc-4.3.3/libjava/configure 2009-01-27 22:19:14.000000000 +0100
-@@ -1018,6 +1018,8 @@
- --enable-gconf-peer compile GConf native peers for util.preferences
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1850,6 +1852,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:14.000000000 +0100
-@@ -82,6 +82,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.3.4/130-cross-compile.patch b/patches/gcc/4.3.4/130-cross-compile.patch
deleted file mode 100644
index e265998..0000000
--- a/patches/gcc/4.3.4/130-cross-compile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Original patch from: ../4.3.2/130-cross-compile.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:19:16.000000000 +0100
-@@ -13442,7 +13442,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:19:16.000000000 +0100
-@@ -1749,7 +1749,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/unwind-dw2.c gcc-4.3.3/gcc/unwind-dw2.c
---- gcc-4.3.3.orig/gcc/unwind-dw2.c 2008-09-25 00:44:28.000000000 +0200
-+++ gcc-4.3.3/gcc/unwind-dw2.c 2009-01-27 22:19:16.000000000 +0100
-@@ -334,9 +334,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.3.4/140-netbsd-symbolic.patch b/patches/gcc/4.3.4/140-netbsd-symbolic.patch
deleted file mode 100644
index a899dd6..0000000
--- a/patches/gcc/4.3.4/140-netbsd-symbolic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/140-netbsd-symbolic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/11_all_gcc-netbsd-symbolic.patch
-http://bugs.gentoo.org/122698
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/netbsd-elf.h gcc-4.3.3/gcc/config/netbsd-elf.h
---- gcc-4.3.3.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.3.3/gcc/config/netbsd-elf.h 2009-01-27 22:19:18.000000000 +0100
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.3.4/150-sparc64-bsd.patch b/patches/gcc/4.3.4/150-sparc64-bsd.patch
deleted file mode 100644
index 233a763..0000000
--- a/patches/gcc/4.3.4/150-sparc64-bsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from: ../4.3.2/150-sparc64-bsd.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/14_all_gcc-sparc64-bsd.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sparc/freebsd.h gcc-4.3.3/gcc/config/sparc/freebsd.h
---- gcc-4.3.3.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sparc/freebsd.h 2009-01-27 22:19:20.000000000 +0100
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.3.4/160-flatten-switch-stmt-00.patch b/patches/gcc/4.3.4/160-flatten-switch-stmt-00.patch
deleted file mode 100644
index 82acfbc..0000000
--- a/patches/gcc/4.3.4/160-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Original patch from: ../4.3.2/160-flatten-switch-stmt-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
-http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
-
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c
---- gcc-4.3.3.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
-+++ gcc-4.3.3/gcc/stmt.c 2009-01-27 22:19:28.000000000 +0100
-@@ -2509,7 +2509,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3067,6 +3071,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.3.4/170-libiberty-pic.patch b/patches/gcc/4.3.4/170-libiberty-pic.patch
deleted file mode 100644
index 00789d0..0000000
--- a/patches/gcc/4.3.4/170-libiberty-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Original patch from: ../4.3.2/170-libiberty-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libiberty/Makefile.in gcc-4.3.3/libiberty/Makefile.in
---- gcc-4.3.3.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200
-+++ gcc-4.3.3/libiberty/Makefile.in 2009-01-27 22:19:30.000000000 +0100
-@@ -225,6 +225,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.3.4/180-superh-default-multilib.patch b/patches/gcc/4.3.4/180-superh-default-multilib.patch
deleted file mode 100644
index a419377..0000000
--- a/patches/gcc/4.3.4/180-superh-default-multilib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/180-superh-default-multilib.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
-The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2008-11-20 18:09:53.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:19:32.000000000 +0100
-@@ -2275,7 +2275,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.3.4/190-libstdc++-pic.patch b/patches/gcc/4.3.4/190-libstdc++-pic.patch
deleted file mode 100644
index d62847c..0000000
--- a/patches/gcc/4.3.4/190-libstdc++-pic.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch from: ../4.3.2/190-libstdc++-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch
-install libstdc++_pic.a if we have pic objs
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am gcc-4.3.3/libstdc++-v3/src/Makefile.am
---- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.3/libstdc++-v3/src/Makefile.am 2009-01-27 22:19:34.000000000 +0100
-@@ -289,6 +289,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in gcc-4.3.3/libstdc++-v3/src/Makefile.in
---- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.3/libstdc++-v3/src/Makefile.in 2009-01-27 22:19:34.000000000 +0100
-@@ -693,7 +693,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -732,7 +732,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -858,6 +858,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.3.4/200-pr24170.patch b/patches/gcc/4.3.4/200-pr24170.patch
deleted file mode 100644
index e2bbc9e..0000000
--- a/patches/gcc/4.3.4/200-pr24170.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Original patch from: ../4.3.2/200-pr24170.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
-http://gcc.gnu.org/PR24170
-
-2008-02-20 Tom Tromey <tromey@redhat.com>
-
- PR libgcj/24170:
- * java/io/natFilePosix.cc (File::performList): Don't use
- readdir_r.
- * configure, include/config.h.in: Rebuilt.
- * configure.ac: Don't check for readdir_r.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2009-01-27 22:19:16.000000000 +0100
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:36.000000000 +0100
-@@ -1030,7 +1030,7 @@
- PLATFORMNET=NoNet
- else
- AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
-- localtime_r readdir_r getpwuid_r getcwd \
-+ localtime_r getpwuid_r getcwd \
- access stat lstat mkdir rename rmdir unlink utime chmod readlink \
- nl_langinfo setlocale \
- inet_pton uname inet_ntoa \
-diff -durN gcc-4.3.3.orig/libjava/include/config.h.in gcc-4.3.3/libjava/include/config.h.in
---- gcc-4.3.3.orig/libjava/include/config.h.in 2007-07-31 18:17:21.000000000 +0200
-+++ gcc-4.3.3/libjava/include/config.h.in 2009-01-27 22:19:36.000000000 +0100
-@@ -214,9 +214,6 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
-
--/* Define to 1 if you have the `readdir_r' function. */
--#undef HAVE_READDIR_R
--
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
-diff -durN gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc gcc-4.3.3/libjava/java/io/natFilePosix.cc
---- gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc 2007-08-04 23:50:01.000000000 +0200
-+++ gcc-4.3.3/libjava/java/io/natFilePosix.cc 2009-01-27 22:19:36.000000000 +0100
-@@ -1,6 +1,6 @@
- // natFile.cc - Native part of File class for POSIX.
-
--/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
-+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
- Free Software Foundation
-
- This file is part of libgcj.
-@@ -292,13 +292,7 @@
-
- java::util::ArrayList *list = new java::util::ArrayList ();
- struct dirent *d;
--#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-- int name_max = pathconf (buf, _PC_NAME_MAX);
-- char dbuf[sizeof (struct dirent) + name_max + 1];
-- while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
--#else /* HAVE_READDIR_R */
- while ((d = readdir (dir)) != NULL)
--#endif /* HAVE_READDIR_R */
- {
- // Omit "." and "..".
- if (d->d_name[0] == '.'
diff --git a/patches/gcc/4.3.4/210-noteGNUstack-00.patch b/patches/gcc/4.3.4/210-noteGNUstack-00.patch
deleted file mode 100644
index 84c6424..0000000
--- a/patches/gcc/4.3.4/210-noteGNUstack-00.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Original patch from: ../4.3.2/210-noteGNUstack-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
-2004-09-20 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
- on ppc64-linux.
-
- * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
- ia64-linux.
- * config/ia64/crtbegin.asm: Likewise.
- * config/ia64/crtend.asm: Likewise.
- * config/ia64/crti.asm: Likewise.
- * config/ia64/crtn.asm: Likewise.
-
-2004-05-14 Jakub Jelinek <jakub@redhat.com>
-
- * config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm gcc-4.3.3/gcc/config/ia64/crtbegin.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtbegin.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -255,3 +255,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtend.asm gcc-4.3.3/gcc/config/ia64/crtend.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtend.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtend.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -122,3 +122,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crti.asm gcc-4.3.3/gcc/config/ia64/crti.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crti.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crti.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -64,3 +64,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtn.asm gcc-4.3.3/gcc/config/ia64/crtn.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtn.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtn.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -54,3 +54,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm gcc-4.3.3/gcc/config/ia64/lib1funcs.asm
---- gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/lib1funcs.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -792,3 +792,7 @@
- }
- .endp __floattitf
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 16:15:19.000000000 +0100
-+++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-27 22:19:39.000000000 +0100
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h gcc-4.3.3/gcc/config/rs6000/ppc-asm.h
---- gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h 2003-06-04 18:44:51.000000000 +0200
-+++ gcc-4.3.3/gcc/config/rs6000/ppc-asm.h 2009-01-27 22:19:39.000000000 +0100
-@@ -158,7 +158,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.3.4/220-noteGNUstack-01.patch b/patches/gcc/4.3.4/220-noteGNUstack-01.patch
deleted file mode 100644
index cb6e999..0000000
--- a/patches/gcc/4.3.4/220-noteGNUstack-01.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Original patch from: ../4.3.2/220-noteGNUstack-01.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
-2005-02-08 Jakub Jelinek <jakub@redhat.com>
-
- * src/alpha/osf.S: Add .note.GNU-stack on Linux.
- * src/s390/sysv.S: Likewise.
- * src/powerpc/linux64.S: Likewise.
- * src/powerpc/linux64_closure.S: Likewise.
- * src/powerpc/ppc_closure.S: Likewise.
- * src/powerpc/sysv.S: Likewise.
- * src/x86/unix64.S: Likewise.
- * src/x86/sysv.S: Likewise.
- * src/sparc/v8.S: Likewise.
- * src/sparc/v9.S: Likewise.
- * src/m68k/sysv.S: Likewise.
- * src/ia64/unix.S: Likewise.
- * src/arm/sysv.S: Likewise.
-
- * ia64_save_regs_in_stack.s: Moved to...
- * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
- on Linux.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S 2009-01-27 22:25:27.000000000 +0100
-@@ -0,0 +1,15 @@
-+ .text
-+ .align 16
-+ .global GC_save_regs_in_stack
-+ .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+ .bodyfoo.mpg
-+ flushrs
-+ ;;
-+ mov r8=ar.bsp
-+ br.ret.sptk.few rp
-+ .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
-- .text
-- .align 16
-- .global GC_save_regs_in_stack
-- .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
-- .body
-- flushrs
-- ;;
-- mov r8=ar.bsp
-- br.ret.sptk.few rp
-- .endp GC_save_regs_in_stack
--
-diff -durN gcc-4.3.3.orig/libffi/src/alpha/osf.S gcc-4.3.3/libffi/src/alpha/osf.S
---- gcc-4.3.3.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
-+++ gcc-4.3.3/libffi/src/alpha/osf.S 2009-01-27 22:25:27.000000000 +0100
-@@ -358,4 +358,8 @@
- .byte 16 # uleb128 offset 16*-8
- .align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
- #endif
-diff -durN gcc-4.3.3.orig/libffi/src/arm/sysv.S gcc-4.3.3/libffi/src/arm/sysv.S
---- gcc-4.3.3.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
-+++ gcc-4.3.3/libffi/src/arm/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -293,3 +293,6 @@
- UNWIND .fnend
- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/ia64/unix.S gcc-4.3.3/libffi/src/ia64/unix.S
---- gcc-4.3.3.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
-+++ gcc-4.3.3/libffi/src/ia64/unix.S 2009-01-27 22:25:27.000000000 +0100
-@@ -553,3 +553,7 @@
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
- data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/m68k/sysv.S gcc-4.3.3/libffi/src/m68k/sysv.S
---- gcc-4.3.3.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
-+++ gcc-4.3.3/libffi/src/m68k/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -207,3 +207,7 @@
- rts
- CFI_ENDPROC()
- .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64.S gcc-4.3.3/libffi/src/powerpc/linux64.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/linux64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -179,3 +179,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.3/libffi/src/powerpc/linux64_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
-+++ gcc-4.3.3/libffi/src/powerpc/linux64_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -204,3 +204,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.3/libffi/src/powerpc/ppc_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/ppc_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -295,3 +295,7 @@
- .LEFDE1:
-
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/sysv.S gcc-4.3.3/libffi/src/powerpc/sysv.S
---- gcc-4.3.3.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -223,3 +223,7 @@
- .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/s390/sysv.S gcc-4.3.3/libffi/src/s390/sysv.S
---- gcc-4.3.3.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
-+++ gcc-4.3.3/libffi/src/s390/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -427,3 +427,6 @@
-
- #endif
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v8.S gcc-4.3.3/libffi/src/sparc/v8.S
---- gcc-4.3.3.orig/libffi/src/sparc/v8.S 2008-11-21 23:13:13.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v8.S 2009-01-27 22:25:27.000000000 +0100
-@@ -306,3 +306,7 @@
- .byte 0x1f ! uleb128 0x1f
- .align WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v9.S gcc-4.3.3/libffi/src/sparc/v9.S
---- gcc-4.3.3.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v9.S 2009-01-27 22:25:27.000000000 +0100
-@@ -300,3 +300,7 @@
- .align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/sysv.S gcc-4.3.3/libffi/src/x86/sysv.S
---- gcc-4.3.3.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
-+++ gcc-4.3.3/libffi/src/x86/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -430,3 +430,7 @@
- #endif
-
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/unix64.S gcc-4.3.3/libffi/src/x86/unix64.S
---- gcc-4.3.3.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
-+++ gcc-4.3.3/libffi/src/x86/unix64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -410,3 +410,7 @@
- .LEFDE3:
-
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc/4.3.4/230-pr34571.patch b/patches/gcc/4.3.4/230-pr34571.patch
deleted file mode 100644
index c28a1cc..0000000
--- a/patches/gcc/4.3.4/230-pr34571.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Original patch from: ../4.3.2/230-pr34571.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
-http://gcc.gnu.org/PR34571
-
-2007-12-26 Rask Ingemann Lambertsen <rask@sygehus.dk>
-
- PR target/34571
- * config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
- symbolic_operand.
- * varasm.c (output_constant_pool_1): Fix typo.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.c 2008-09-09 01:16:55.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.c 2009-01-27 22:25:29.000000000 +0100
-@@ -1113,8 +1113,7 @@
- static bool
- alpha_cannot_force_const_mem (rtx x)
- {
-- enum rtx_code code = GET_CODE (x);
-- return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
-+ return symbolic_operand (x, GET_MODE (x));
- }
-
- /* We do not allow indirect calls to be optimized into sibling calls, nor
diff --git a/patches/gcc/4.3.4/240-pr25343.patch b/patches/gcc/4.3.4/240-pr25343.patch
deleted file mode 100644
index 07d6318..0000000
--- a/patches/gcc/4.3.4/240-pr25343.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Original patch from: ../4.3.2/240-pr25343.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/66_all_gcc43-pr25343.patch
-http://gcc.gnu.org/PR25343
-
-sniped from Debian
-
-2008-04-27 Roman Zippel <zippel@linux-m68k.org>
-
- * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __mc68000__.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/host-linux.c gcc-4.3.3/gcc/config/host-linux.c
---- gcc-4.3.3.orig/gcc/config/host-linux.c 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/host-linux.c 2009-01-27 22:25:31.000000000 +0100
-@@ -84,6 +84,8 @@
- # define TRY_EMPTY_VM_SPACE 0x8000000000
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE 0x60000000
-+#elif defined(__mc68000__)
-+# define TRY_EMPTY_VM_SPACE 0x40000000
- #else
- # define TRY_EMPTY_VM_SPACE 0
- #endif
diff --git a/patches/gcc/4.3.4/250-sh-pr24836.patch b/patches/gcc/4.3.4/250-sh-pr24836.patch
deleted file mode 100644
index 1528b35..0000000
--- a/patches/gcc/4.3.4/250-sh-pr24836.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Original patch from: ../4.3.2/250-sh-pr24836.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/PR24836
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:25:33.000000000 +0100
-@@ -20689,7 +20689,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:25:33.000000000 +0100
-@@ -2552,7 +2552,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.3.4/260-uclibc-conf-noupstream.patch b/patches/gcc/4.3.4/260-uclibc-conf-noupstream.patch
deleted file mode 100644
index c046030..0000000
--- a/patches/gcc/4.3.4/260-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/260-uclibc-conf-noupstream.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:19:34.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:25:35.000000000 +0100
-@@ -2146,7 +2146,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.3.4/270-missing-execinfo_h.patch b/patches/gcc/4.3.4/270-missing-execinfo_h.patch
deleted file mode 100644
index 8f36f45..0000000
--- a/patches/gcc/4.3.4/270-missing-execinfo_h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/270-missing-execinfo_h.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_301-missing-execinfo_h.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/include/gc.h gcc-4.3.3/boehm-gc/include/gc.h
---- gcc-4.3.3.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/include/gc.h 2009-01-27 22:25:37.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.3.4/280-c99-complex-ugly-hack.patch b/patches/gcc/4.3.4/280-c99-complex-ugly-hack.patch
deleted file mode 100644
index 7588647..0000000
--- a/patches/gcc/4.3.4/280-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/280-c99-complex-ugly-hack.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
---- gcc-4.3.3.orig/libstdc++-v3/configure 2008-07-07 21:49:54.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/configure 2009-01-27 22:25:39.000000000 +0100
-@@ -38935,6 +38935,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.3.4/290-index_macro.patch b/patches/gcc/4.3.4/290-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.3.4/290-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.3.4/300-libmudflap-susv3-legacy.patch b/patches/gcc/4.3.4/300-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 7b20da9..0000000
--- a/patches/gcc/4.3.4/300-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Original patch from: ../4.3.2/300-libmudflap-susv3-legacy.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libmudflap/mf-hooks2.c gcc-4.3.3/libmudflap/mf-hooks2.c
---- gcc-4.3.3.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.3.3/libmudflap/mf-hooks2.c 2009-01-27 22:25:45.000000000 +0100
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.3.4/310-arm-softfloat.patch b/patches/gcc/4.3.4/310-arm-softfloat.patch
deleted file mode 100644
index 60de45f..0000000
--- a/patches/gcc/4.3.4/310-arm-softfloat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Original patch from: ../4.3.2/310-arm-softfloat.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-27 22:25:47.000000000 +0100
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/t-linux gcc-4.3.3/gcc/config/arm/t-linux
---- gcc-4.3.3.orig/gcc/config/arm/t-linux 2006-11-09 23:14:27.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/t-linux 2009-01-27 22:25:47.000000000 +0100
-@@ -3,7 +3,12 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
-+ _call_via_rX _interwork_call_via_rX \
-+ _lshrdi3 _ashrdi3 _ashldi3 \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc/4.3.4/320-alpha-signal_h.patch b/patches/gcc/4.3.4/320-alpha-signal_h.patch
deleted file mode 100644
index 2f4df3e..0000000
--- a/patches/gcc/4.3.4/320-alpha-signal_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Original patch from: ../4.3.2/320-alpha-signal_h.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.3.3/gcc/config/alpha/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h 2006-10-26 21:31:09.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/linux-unwind.h 2009-01-27 22:25:49.000000000 +0100
-@@ -29,6 +29,9 @@
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.3.4/330-unwind-for-uClibc.patch b/patches/gcc/4.3.4/330-unwind-for-uClibc.patch
deleted file mode 100644
index ac97c2f..0000000
--- a/patches/gcc/4.3.4/330-unwind-for-uClibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/330-unwind-for-uClibc.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/t-linux-uclibc gcc-4.3.3/gcc/config/t-linux-uclibc
---- gcc-4.3.3.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/gcc/config/t-linux-uclibc 2009-01-27 22:28:53.000000000 +0100
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:28:53.000000000 +0100
-@@ -2648,6 +2648,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+ *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
diff --git a/patches/gcc/4.3.4/340-make-mno-spe-work-as-expected.patch b/patches/gcc/4.3.4/340-make-mno-spe-work-as-expected.patch
deleted file mode 100644
index ad2d203..0000000
--- a/patches/gcc/4.3.4/340-make-mno-spe-work-as-expected.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Original patch from: ../4.3.2/340-make-mno-spe-work-as-expected.patch
-
--= BEGIN original header =-
-2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
- Nathan Sidwell <nathan@codesourcery.com>
-
- * config/rs6000/rs6000.opt (mspe): Remove Var property.
- (misel): Likewise.
- * config/rs6000/rs6000.h (rs6000_spe): Declare.
- (rs6000_isel): Likewise.
- * config/rs6000/rs6000.c (rs6000_spe): New variable.
- (rs6000_isel): New variable.
- (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c gcc-4.3.3/gcc/config/rs6000/rs6000.c
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c 2008-11-18 23:07:58.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.c 2009-01-27 22:28:55.000000000 +0100
-@@ -174,9 +174,15 @@
- /* Nonzero to use AltiVec ABI. */
- int rs6000_altivec_abi;
-
-+/* Nonzero if we want SPE SIMD instructions. */
-+int rs6000_spe;
-+
- /* Nonzero if we want SPE ABI extensions. */
- int rs6000_spe_abi;
-
-+/* Nonzero to use isel instructions. */
-+int rs6000_isel;
-+
- /* Nonzero if floating point operations are done in the GPRs. */
- int rs6000_float_gprs = 0;
-
-@@ -2144,11 +2150,21 @@
- rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
- break;
-
-+ case OPT_misel:
-+ rs6000_explicit_options.isel = true;
-+ rs6000_isel = value;
-+ break;
-+
- case OPT_misel_:
- rs6000_explicit_options.isel = true;
- rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
- break;
-
-+ case OPT_mspe:
-+ rs6000_explicit_options.spe = true;
-+ rs6000_spe = value;
-+ break;
-+
- case OPT_mspe_:
- rs6000_explicit_options.spe = true;
- rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h gcc-4.3.3/gcc/config/rs6000/rs6000.h
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h 2008-01-26 18:18:35.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.h 2009-01-27 22:28:55.000000000 +0100
-@@ -349,6 +349,8 @@
- extern int rs6000_ieeequad;
- extern int rs6000_altivec_abi;
- extern int rs6000_spe_abi;
-+extern int rs6000_spe;
-+extern int rs6000_isel;
- extern int rs6000_float_gprs;
- extern int rs6000_alignment_flags;
- extern const char *rs6000_sched_insert_nops_str;
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt gcc-4.3.3/gcc/config/rs6000/rs6000.opt
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt 2007-10-31 08:56:01.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.opt 2009-01-27 22:28:55.000000000 +0100
-@@ -190,7 +190,7 @@
- -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
-
- misel
--Target Var(rs6000_isel)
-+Target
- Generate isel instructions
-
- misel=
-@@ -198,7 +198,7 @@
- -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
-
- mspe
--Target Var(rs6000_spe)
-+Target
- Generate SPE SIMD instructions on E500
-
- mpaired
diff --git a/patches/gcc/4.3.4/350-sh-without-headers.patch b/patches/gcc/4.3.4/350-sh-without-headers.patch
deleted file mode 100644
index 0bb860d..0000000
--- a/patches/gcc/4.3.4/350-sh-without-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Original patch from: ../4.3.2/350-sh-without-headers.patch
-
--= BEGIN original header =-
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h gcc-4.3.3/gcc/config/sh/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h 2007-09-12 08:59:06.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sh/linux-unwind.h 2009-01-27 22:28:57.000000000 +0100
-@@ -26,6 +26,8 @@
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
diff --git a/patches/gcc/4.3.4/380-pr37436.patch b/patches/gcc/4.3.4/380-pr37436.patch
deleted file mode 100644
index 99a016f..0000000
--- a/patches/gcc/4.3.4/380-pr37436.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-gcc svn 142778:
-
-PR target/37436
-* arm.c (arm_legitimate_index): Only accept addresses that are in
-canonical form.
-* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
-* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
-for operand1.
-(extendqisi2): Likewise.
-(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
-predicate for operand1.
-
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
---- gcc-4.3.3.orig/gcc/config/arm/arm.c 2008-06-11 07:52:55.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.c 2009-05-21 16:06:45.000000000 -0300
-@@ -3769,6 +3769,7 @@
- rtx xop1 = XEXP (x, 1);
-
- return ((arm_address_register_rtx_p (xop0, strict_p)
-+ && GET_CODE(xop1) == CONST_INT
- && arm_legitimate_index_p (mode, xop1, outer, strict_p))
- || (arm_address_register_rtx_p (xop1, strict_p)
- && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
---- gcc-4.3.3.orig/gcc/config/arm/arm.md 2007-09-04 01:44:47.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.md 2009-05-21 16:06:45.000000000 -0300
-@@ -4199,7 +4199,7 @@
-
- (define_expand "extendqihi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:HI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4224,7 +4224,7 @@
-
- (define_insn "*arm_extendqihi_insn"
- [(set (match_operand:HI 0 "s_register_operand" "=r")
-- (sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4235,7 +4235,7 @@
-
- (define_expand "extendqisi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:SI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4267,7 +4267,7 @@
-
- (define_insn "*arm_extendqisi"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
-- (sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4 && !arm_arch6"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4278,7 +4278,8 @@
-
- (define_insn "*arm_extendqisi_v6"
- [(set (match_operand:SI 0 "s_register_operand" "=r,r")
-- (sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
-+ (sign_extend:SI
-+ (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
- "TARGET_ARM && arm_arch6"
- "@
- sxtb%?\\t%0, %1
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
---- gcc-4.3.3.orig/gcc/config/arm/predicates.md 2007-08-02 07:49:31.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/predicates.md 2009-05-21 16:06:45.000000000 -0300
-@@ -234,6 +234,10 @@
- (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
- 0)")))
-
-+(define_special_predicate "arm_reg_or_extendqisi_mem_op"
-+ (ior (match_operand 0 "arm_extendqisi_mem_op")
-+ (match_operand 0 "s_register_operand")))
-+
- (define_predicate "power_of_two_operand"
- (match_code "const_int")
- {
diff --git a/patches/gcc/4.3.4/390-unbreak-armv4t.patch b/patches/gcc/4.3.4/390-unbreak-armv4t.patch
deleted file mode 100644
index af14e0d..0000000
--- a/patches/gcc/4.3.4/390-unbreak-armv4t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200
-+++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.3.4/400-ecjx-host-cc.patch b/patches/gcc/4.3.4/400-ecjx-host-cc.patch
deleted file mode 100644
index 793069b..0000000
--- a/patches/gcc/4.3.4/400-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur gcc-4.3.4-orig/libjava/Makefile.in gcc-4.3.4/libjava/Makefile.in
---- gcc-4.3.4-orig/libjava/Makefile.in 2009-08-04 04:12:27.000000000 -0700
-+++ gcc-4.3.4/libjava/Makefile.in 2009-09-23 22:03:15.750951483 -0700
-@@ -8874,6 +8874,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.3.4/410-libgcc_eh.a.patch b/patches/gcc/4.3.4/410-libgcc_eh.a.patch
deleted file mode 100644
index 854198a..0000000
--- a/patches/gcc/4.3.4/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.3.2.orig//libgcc/Makefile.in gcc-4.3.2/libgcc/Makefile.in
---- gcc-4.3.2.orig//libgcc/Makefile.in 2008-06-17 11:32:34.000000000 +0200
-+++ gcc-4.3.2/libgcc/Makefile.in 2011-09-02 12:27:39.296538955 +0200
-@@ -705,8 +705,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -875,10 +876,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -893,6 +890,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.3.5/100-alpha-mieee-default.patch b/patches/gcc/4.3.5/100-alpha-mieee-default.patch
deleted file mode 100644
index 945019d..0000000
--- a/patches/gcc/4.3.5/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Original patch from: ../4.3.2/100-alpha-mieee-default.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
-Set the default behavior on alpha to use -mieee since the large majority of
-time we want this (bad/weird things can happen with packages built without
--mieee).
-
-To satisfy those people who may not want -mieee forced on them all the time,
-we also provide -mno-ieee.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.h gcc-4.3.3/gcc/config/alpha/alpha.h
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.h 2007-12-06 14:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config/alpha/alpha.h 2009-01-27 22:19:02.000000000 +0100
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.opt gcc-4.3.3/gcc/config/alpha/alpha.opt
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.opt 2009-01-27 22:19:02.000000000 +0100
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.3.5/110-trampolinewarn.patch b/patches/gcc/4.3.5/110-trampolinewarn.patch
deleted file mode 100644
index 43ab217..0000000
--- a/patches/gcc/4.3.5/110-trampolinewarn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Original patch from: ../4.3.2/110-trampolinewarn.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/00_all_gcc-trampolinewarn.patch
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/builtins.c gcc-4.3.3/gcc/builtins.c
---- gcc-4.3.3.orig/gcc/builtins.c 2008-08-19 18:37:13.000000000 +0200
-+++ gcc-4.3.3/gcc/builtins.c 2009-01-27 22:19:12.000000000 +0100
-@@ -5662,6 +5662,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.3.3.orig/gcc/common.opt gcc-4.3.3/gcc/common.opt
---- gcc-4.3.3.orig/gcc/common.opt 2008-01-22 15:11:44.000000000 +0100
-+++ gcc-4.3.3/gcc/common.opt 2009-01-27 22:19:12.000000000 +0100
-@@ -182,6 +182,10 @@
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.3.5/120-java-nomulti.patch b/patches/gcc/4.3.5/120-java-nomulti.patch
deleted file mode 100644
index 47b813e..0000000
--- a/patches/gcc/4.3.5/120-java-nomulti.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Original patch from: ../4.3.2/120-java-nomulti.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
---- gcc-4.3.3.orig/libjava/configure 2009-01-24 11:32:29.000000000 +0100
-+++ gcc-4.3.3/libjava/configure 2009-01-27 22:19:14.000000000 +0100
-@@ -1018,6 +1018,8 @@
- --enable-gconf-peer compile GConf native peers for util.preferences
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1850,6 +1852,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:14.000000000 +0100
-@@ -82,6 +82,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.3.5/130-cross-compile.patch b/patches/gcc/4.3.5/130-cross-compile.patch
deleted file mode 100644
index e265998..0000000
--- a/patches/gcc/4.3.5/130-cross-compile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Original patch from: ../4.3.2/130-cross-compile.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:19:16.000000000 +0100
-@@ -13442,7 +13442,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2008-08-01 11:51:03.000000000 +0200
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:19:16.000000000 +0100
-@@ -1749,7 +1749,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.3.3.orig/gcc/unwind-dw2.c gcc-4.3.3/gcc/unwind-dw2.c
---- gcc-4.3.3.orig/gcc/unwind-dw2.c 2008-09-25 00:44:28.000000000 +0200
-+++ gcc-4.3.3/gcc/unwind-dw2.c 2009-01-27 22:19:16.000000000 +0100
-@@ -334,9 +334,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.3.5/140-netbsd-symbolic.patch b/patches/gcc/4.3.5/140-netbsd-symbolic.patch
deleted file mode 100644
index a899dd6..0000000
--- a/patches/gcc/4.3.5/140-netbsd-symbolic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/140-netbsd-symbolic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/11_all_gcc-netbsd-symbolic.patch
-http://bugs.gentoo.org/122698
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/netbsd-elf.h gcc-4.3.3/gcc/config/netbsd-elf.h
---- gcc-4.3.3.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.3.3/gcc/config/netbsd-elf.h 2009-01-27 22:19:18.000000000 +0100
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.3.5/150-sparc64-bsd.patch b/patches/gcc/4.3.5/150-sparc64-bsd.patch
deleted file mode 100644
index 233a763..0000000
--- a/patches/gcc/4.3.5/150-sparc64-bsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original patch from: ../4.3.2/150-sparc64-bsd.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/14_all_gcc-sparc64-bsd.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sparc/freebsd.h gcc-4.3.3/gcc/config/sparc/freebsd.h
---- gcc-4.3.3.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sparc/freebsd.h 2009-01-27 22:19:20.000000000 +0100
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.3.5/160-flatten-switch-stmt-00.patch b/patches/gcc/4.3.5/160-flatten-switch-stmt-00.patch
deleted file mode 100644
index 82acfbc..0000000
--- a/patches/gcc/4.3.5/160-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Original patch from: ../4.3.2/160-flatten-switch-stmt-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
-http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
-
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15 Bernhard Fischer <..>
-
- * stmt.c (expand_case): Do not create a complex binary tree when
- optimizing for size but rather use the simple ordered list.
- (emit_case_nodes): do not emit jumps to the default_label when
- optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
- text data bss dec hex filename
- 169 0 0 169 a9 switch-2.95.o
- 115 0 0 115 73 switch-3.3.o
- 103 0 0 103 67 switch-3.4.o
- 124 0 0 124 7c switch-4.0.o
- 124 0 0 124 7c switch-4.1.o
- 124 0 0 124 7c switch-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-4.3-HEAD.o
- 124 0 0 124 7c switch-4.3.orig-HEAD.o
- 166 0 0 166 a6 switch-CHAIN-2.95.o
- 111 0 0 111 6f switch-CHAIN-3.3.o
- 95 0 0 95 5f switch-CHAIN-3.4.o
- 95 0 0 95 5f switch-CHAIN-4.0.o
- 95 0 0 95 5f switch-CHAIN-4.1.o
- 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
- 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c
---- gcc-4.3.3.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
-+++ gcc-4.3.3/gcc/stmt.c 2009-01-27 22:19:28.000000000 +0100
-@@ -2509,7 +2509,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- emit_jump (default_label);
- }
-@@ -3067,6 +3071,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.3.5/170-libiberty-pic.patch b/patches/gcc/4.3.5/170-libiberty-pic.patch
deleted file mode 100644
index 00789d0..0000000
--- a/patches/gcc/4.3.5/170-libiberty-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Original patch from: ../4.3.2/170-libiberty-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libiberty/Makefile.in gcc-4.3.3/libiberty/Makefile.in
---- gcc-4.3.3.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200
-+++ gcc-4.3.3/libiberty/Makefile.in 2009-01-27 22:19:30.000000000 +0100
-@@ -225,6 +225,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.3.5/180-superh-default-multilib.patch b/patches/gcc/4.3.5/180-superh-default-multilib.patch
deleted file mode 100644
index a419377..0000000
--- a/patches/gcc/4.3.5/180-superh-default-multilib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/180-superh-default-multilib.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
-The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2008-11-20 18:09:53.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:19:32.000000000 +0100
-@@ -2275,7 +2275,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.3.5/190-libstdc++-pic.patch b/patches/gcc/4.3.5/190-libstdc++-pic.patch
deleted file mode 100644
index f4bc602..0000000
--- a/patches/gcc/4.3.5/190-libstdc++-pic.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch from: ../4.3.2/190-libstdc++-pic.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch
-install libstdc++_pic.a if we have pic objs
-
--= END original header =-
-
-diff -durN gcc-4.3.5.orig/libstdc++-v3/src/Makefile.am gcc-4.3.5/libstdc++-v3/src/Makefile.am
---- gcc-4.3.5.orig/libstdc++-v3/src/Makefile.am 2008-02-29 19:26:50.000000000 +0100
-+++ gcc-4.3.5/libstdc++-v3/src/Makefile.am 2010-09-19 18:58:40.000000000 +0200
-@@ -289,6 +289,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.3.5.orig/libstdc++-v3/src/Makefile.in gcc-4.3.5/libstdc++-v3/src/Makefile.in
---- gcc-4.3.5.orig/libstdc++-v3/src/Makefile.in 2010-05-06 19:19:46.000000000 +0200
-+++ gcc-4.3.5/libstdc++-v3/src/Makefile.in 2010-09-19 19:01:43.000000000 +0200
-@@ -646,7 +646,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -685,7 +685,7 @@
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -811,6 +811,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.3.5/200-pr24170.patch b/patches/gcc/4.3.5/200-pr24170.patch
deleted file mode 100644
index e2bbc9e..0000000
--- a/patches/gcc/4.3.5/200-pr24170.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Original patch from: ../4.3.2/200-pr24170.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
-http://gcc.gnu.org/PR24170
-
-2008-02-20 Tom Tromey <tromey@redhat.com>
-
- PR libgcj/24170:
- * java/io/natFilePosix.cc (File::performList): Don't use
- readdir_r.
- * configure, include/config.h.in: Rebuilt.
- * configure.ac: Don't check for readdir_r.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
---- gcc-4.3.3.orig/libjava/configure.ac 2009-01-27 22:19:16.000000000 +0100
-+++ gcc-4.3.3/libjava/configure.ac 2009-01-27 22:19:36.000000000 +0100
-@@ -1030,7 +1030,7 @@
- PLATFORMNET=NoNet
- else
- AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
-- localtime_r readdir_r getpwuid_r getcwd \
-+ localtime_r getpwuid_r getcwd \
- access stat lstat mkdir rename rmdir unlink utime chmod readlink \
- nl_langinfo setlocale \
- inet_pton uname inet_ntoa \
-diff -durN gcc-4.3.3.orig/libjava/include/config.h.in gcc-4.3.3/libjava/include/config.h.in
---- gcc-4.3.3.orig/libjava/include/config.h.in 2007-07-31 18:17:21.000000000 +0200
-+++ gcc-4.3.3/libjava/include/config.h.in 2009-01-27 22:19:36.000000000 +0100
-@@ -214,9 +214,6 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
-
--/* Define to 1 if you have the `readdir_r' function. */
--#undef HAVE_READDIR_R
--
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
-diff -durN gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc gcc-4.3.3/libjava/java/io/natFilePosix.cc
---- gcc-4.3.3.orig/libjava/java/io/natFilePosix.cc 2007-08-04 23:50:01.000000000 +0200
-+++ gcc-4.3.3/libjava/java/io/natFilePosix.cc 2009-01-27 22:19:36.000000000 +0100
-@@ -1,6 +1,6 @@
- // natFile.cc - Native part of File class for POSIX.
-
--/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
-+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
- Free Software Foundation
-
- This file is part of libgcj.
-@@ -292,13 +292,7 @@
-
- java::util::ArrayList *list = new java::util::ArrayList ();
- struct dirent *d;
--#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
-- int name_max = pathconf (buf, _PC_NAME_MAX);
-- char dbuf[sizeof (struct dirent) + name_max + 1];
-- while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
--#else /* HAVE_READDIR_R */
- while ((d = readdir (dir)) != NULL)
--#endif /* HAVE_READDIR_R */
- {
- // Omit "." and "..".
- if (d->d_name[0] == '.'
diff --git a/patches/gcc/4.3.5/210-noteGNUstack-00.patch b/patches/gcc/4.3.5/210-noteGNUstack-00.patch
deleted file mode 100644
index 84c6424..0000000
--- a/patches/gcc/4.3.5/210-noteGNUstack-00.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Original patch from: ../4.3.2/210-noteGNUstack-00.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
-2004-09-20 Jakub Jelinek <jakub@redhat.com>
-
- * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
- on ppc64-linux.
-
- * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
- ia64-linux.
- * config/ia64/crtbegin.asm: Likewise.
- * config/ia64/crtend.asm: Likewise.
- * config/ia64/crti.asm: Likewise.
- * config/ia64/crtn.asm: Likewise.
-
-2004-05-14 Jakub Jelinek <jakub@redhat.com>
-
- * config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm gcc-4.3.3/gcc/config/ia64/crtbegin.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtbegin.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtbegin.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -255,3 +255,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtend.asm gcc-4.3.3/gcc/config/ia64/crtend.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtend.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtend.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -122,3 +122,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crti.asm gcc-4.3.3/gcc/config/ia64/crti.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crti.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crti.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -64,3 +64,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/crtn.asm gcc-4.3.3/gcc/config/ia64/crtn.asm
---- gcc-4.3.3.orig/gcc/config/ia64/crtn.asm 2005-06-25 03:22:41.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/crtn.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -54,3 +54,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm gcc-4.3.3/gcc/config/ia64/lib1funcs.asm
---- gcc-4.3.3.orig/gcc/config/ia64/lib1funcs.asm 2005-09-27 02:52:24.000000000 +0200
-+++ gcc-4.3.3/gcc/config/ia64/lib1funcs.asm 2009-01-27 22:19:39.000000000 +0100
-@@ -792,3 +792,7 @@
- }
- .endp __floattitf
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 16:15:19.000000000 +0100
-+++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-27 22:19:39.000000000 +0100
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h gcc-4.3.3/gcc/config/rs6000/ppc-asm.h
---- gcc-4.3.3.orig/gcc/config/rs6000/ppc-asm.h 2003-06-04 18:44:51.000000000 +0200
-+++ gcc-4.3.3/gcc/config/rs6000/ppc-asm.h 2009-01-27 22:19:39.000000000 +0100
-@@ -158,7 +158,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.3.5/220-noteGNUstack-01.patch b/patches/gcc/4.3.5/220-noteGNUstack-01.patch
deleted file mode 100644
index cb6e999..0000000
--- a/patches/gcc/4.3.5/220-noteGNUstack-01.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Original patch from: ../4.3.2/220-noteGNUstack-01.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
-2005-02-08 Jakub Jelinek <jakub@redhat.com>
-
- * src/alpha/osf.S: Add .note.GNU-stack on Linux.
- * src/s390/sysv.S: Likewise.
- * src/powerpc/linux64.S: Likewise.
- * src/powerpc/linux64_closure.S: Likewise.
- * src/powerpc/ppc_closure.S: Likewise.
- * src/powerpc/sysv.S: Likewise.
- * src/x86/unix64.S: Likewise.
- * src/x86/sysv.S: Likewise.
- * src/sparc/v8.S: Likewise.
- * src/sparc/v9.S: Likewise.
- * src/m68k/sysv.S: Likewise.
- * src/ia64/unix.S: Likewise.
- * src/arm/sysv.S: Likewise.
-
- * ia64_save_regs_in_stack.s: Moved to...
- * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
- on Linux.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.S 2009-01-27 22:25:27.000000000 +0100
-@@ -0,0 +1,15 @@
-+ .text
-+ .align 16
-+ .global GC_save_regs_in_stack
-+ .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+ .bodyfoo.mpg
-+ flushrs
-+ ;;
-+ mov r8=ar.bsp
-+ br.ret.sptk.few rp
-+ .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.3.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/ia64_save_regs_in_stack.s 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
-- .text
-- .align 16
-- .global GC_save_regs_in_stack
-- .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
-- .body
-- flushrs
-- ;;
-- mov r8=ar.bsp
-- br.ret.sptk.few rp
-- .endp GC_save_regs_in_stack
--
-diff -durN gcc-4.3.3.orig/libffi/src/alpha/osf.S gcc-4.3.3/libffi/src/alpha/osf.S
---- gcc-4.3.3.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
-+++ gcc-4.3.3/libffi/src/alpha/osf.S 2009-01-27 22:25:27.000000000 +0100
-@@ -358,4 +358,8 @@
- .byte 16 # uleb128 offset 16*-8
- .align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
- #endif
-diff -durN gcc-4.3.3.orig/libffi/src/arm/sysv.S gcc-4.3.3/libffi/src/arm/sysv.S
---- gcc-4.3.3.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
-+++ gcc-4.3.3/libffi/src/arm/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -293,3 +293,6 @@
- UNWIND .fnend
- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/ia64/unix.S gcc-4.3.3/libffi/src/ia64/unix.S
---- gcc-4.3.3.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
-+++ gcc-4.3.3/libffi/src/ia64/unix.S 2009-01-27 22:25:27.000000000 +0100
-@@ -553,3 +553,7 @@
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
- data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/m68k/sysv.S gcc-4.3.3/libffi/src/m68k/sysv.S
---- gcc-4.3.3.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
-+++ gcc-4.3.3/libffi/src/m68k/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -207,3 +207,7 @@
- rts
- CFI_ENDPROC()
- .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64.S gcc-4.3.3/libffi/src/powerpc/linux64.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/linux64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -179,3 +179,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.3/libffi/src/powerpc/linux64_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
-+++ gcc-4.3.3/libffi/src/powerpc/linux64_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -204,3 +204,7 @@
- .align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.3/libffi/src/powerpc/ppc_closure.S
---- gcc-4.3.3.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/ppc_closure.S 2009-01-27 22:25:27.000000000 +0100
-@@ -295,3 +295,7 @@
- .LEFDE1:
-
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/powerpc/sysv.S gcc-4.3.3/libffi/src/powerpc/sysv.S
---- gcc-4.3.3.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
-+++ gcc-4.3.3/libffi/src/powerpc/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -223,3 +223,7 @@
- .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/s390/sysv.S gcc-4.3.3/libffi/src/s390/sysv.S
---- gcc-4.3.3.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
-+++ gcc-4.3.3/libffi/src/s390/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -427,3 +427,6 @@
-
- #endif
-
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v8.S gcc-4.3.3/libffi/src/sparc/v8.S
---- gcc-4.3.3.orig/libffi/src/sparc/v8.S 2008-11-21 23:13:13.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v8.S 2009-01-27 22:25:27.000000000 +0100
-@@ -306,3 +306,7 @@
- .byte 0x1f ! uleb128 0x1f
- .align WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/sparc/v9.S gcc-4.3.3/libffi/src/sparc/v9.S
---- gcc-4.3.3.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
-+++ gcc-4.3.3/libffi/src/sparc/v9.S 2009-01-27 22:25:27.000000000 +0100
-@@ -300,3 +300,7 @@
- .align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/sysv.S gcc-4.3.3/libffi/src/x86/sysv.S
---- gcc-4.3.3.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
-+++ gcc-4.3.3/libffi/src/x86/sysv.S 2009-01-27 22:25:27.000000000 +0100
-@@ -430,3 +430,7 @@
- #endif
-
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.3.orig/libffi/src/x86/unix64.S gcc-4.3.3/libffi/src/x86/unix64.S
---- gcc-4.3.3.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
-+++ gcc-4.3.3/libffi/src/x86/unix64.S 2009-01-27 22:25:27.000000000 +0100
-@@ -410,3 +410,7 @@
- .LEFDE3:
-
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+ .section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc/4.3.5/230-pr34571.patch b/patches/gcc/4.3.5/230-pr34571.patch
deleted file mode 100644
index c28a1cc..0000000
--- a/patches/gcc/4.3.5/230-pr34571.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Original patch from: ../4.3.2/230-pr34571.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
-http://gcc.gnu.org/PR34571
-
-2007-12-26 Rask Ingemann Lambertsen <rask@sygehus.dk>
-
- PR target/34571
- * config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
- symbolic_operand.
- * varasm.c (output_constant_pool_1): Fix typo.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.c 2008-09-09 01:16:55.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/alpha.c 2009-01-27 22:25:29.000000000 +0100
-@@ -1113,8 +1113,7 @@
- static bool
- alpha_cannot_force_const_mem (rtx x)
- {
-- enum rtx_code code = GET_CODE (x);
-- return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
-+ return symbolic_operand (x, GET_MODE (x));
- }
-
- /* We do not allow indirect calls to be optimized into sibling calls, nor
diff --git a/patches/gcc/4.3.5/240-pr25343.patch b/patches/gcc/4.3.5/240-pr25343.patch
deleted file mode 100644
index 07d6318..0000000
--- a/patches/gcc/4.3.5/240-pr25343.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Original patch from: ../4.3.2/240-pr25343.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/66_all_gcc43-pr25343.patch
-http://gcc.gnu.org/PR25343
-
-sniped from Debian
-
-2008-04-27 Roman Zippel <zippel@linux-m68k.org>
-
- * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __mc68000__.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/host-linux.c gcc-4.3.3/gcc/config/host-linux.c
---- gcc-4.3.3.orig/gcc/config/host-linux.c 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.3/gcc/config/host-linux.c 2009-01-27 22:25:31.000000000 +0100
-@@ -84,6 +84,8 @@
- # define TRY_EMPTY_VM_SPACE 0x8000000000
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE 0x60000000
-+#elif defined(__mc68000__)
-+# define TRY_EMPTY_VM_SPACE 0x40000000
- #else
- # define TRY_EMPTY_VM_SPACE 0
- #endif
diff --git a/patches/gcc/4.3.5/250-sh-pr24836.patch b/patches/gcc/4.3.5/250-sh-pr24836.patch
deleted file mode 100644
index 1528b35..0000000
--- a/patches/gcc/4.3.5/250-sh-pr24836.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Original patch from: ../4.3.2/250-sh-pr24836.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/PR24836
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure 2009-01-27 22:25:33.000000000 +0100
-@@ -20689,7 +20689,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac 2009-01-27 22:19:18.000000000 +0100
-+++ gcc-4.3.3/gcc/configure.ac 2009-01-27 22:25:33.000000000 +0100
-@@ -2552,7 +2552,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.3.5/260-uclibc-conf-noupstream.patch b/patches/gcc/4.3.5/260-uclibc-conf-noupstream.patch
deleted file mode 100644
index c046030..0000000
--- a/patches/gcc/4.3.5/260-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/260-uclibc-conf-noupstream.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:19:34.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:25:35.000000000 +0100
-@@ -2146,7 +2146,7 @@
- ;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-- sh-*-linux* | sh[346lbe]*-*-linux* | \
-+ sh*-*-linux* | sh[346lbe]*-*-linux* | \
- sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
- sh64-*-netbsd* | sh64l*-*-netbsd*)
- tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/patches/gcc/4.3.5/270-missing-execinfo_h.patch b/patches/gcc/4.3.5/270-missing-execinfo_h.patch
deleted file mode 100644
index 8f36f45..0000000
--- a/patches/gcc/4.3.5/270-missing-execinfo_h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from: ../4.3.2/270-missing-execinfo_h.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_301-missing-execinfo_h.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/boehm-gc/include/gc.h gcc-4.3.3/boehm-gc/include/gc.h
---- gcc-4.3.3.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.3.3/boehm-gc/include/gc.h 2009-01-27 22:25:37.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.3.5/280-c99-complex-ugly-hack.patch b/patches/gcc/4.3.5/280-c99-complex-ugly-hack.patch
deleted file mode 100644
index 7588647..0000000
--- a/patches/gcc/4.3.5/280-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Original patch from: ../4.3.2/280-c99-complex-ugly-hack.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
---- gcc-4.3.3.orig/libstdc++-v3/configure 2008-07-07 21:49:54.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/configure 2009-01-27 22:25:39.000000000 +0100
-@@ -38935,6 +38935,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/patches/gcc/4.3.5/290-index_macro.patch b/patches/gcc/4.3.5/290-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.3.5/290-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.3.5/300-libmudflap-susv3-legacy.patch b/patches/gcc/4.3.5/300-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 7b20da9..0000000
--- a/patches/gcc/4.3.5/300-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Original patch from: ../4.3.2/300-libmudflap-susv3-legacy.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_305-libmudflap-susv3-legacy.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libmudflap/mf-hooks2.c gcc-4.3.3/libmudflap/mf-hooks2.c
---- gcc-4.3.3.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200
-+++ gcc-4.3.3/libmudflap/mf-hooks2.c 2009-01-27 22:25:45.000000000 +0100
-@@ -427,7 +427,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -437,7 +437,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -447,7 +447,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return memcmp (s1, s2, n);
- }
-
-
-@@ -456,7 +456,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -465,7 +465,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.3.5/310-arm-softfloat.patch b/patches/gcc/4.3.5/310-arm-softfloat.patch
deleted file mode 100644
index 60de45f..0000000
--- a/patches/gcc/4.3.5/310-arm-softfloat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Original patch from: ../4.3.2/310-arm-softfloat.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-27 22:25:47.000000000 +0100
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
-diff -durN gcc-4.3.3.orig/gcc/config/arm/t-linux gcc-4.3.3/gcc/config/arm/t-linux
---- gcc-4.3.3.orig/gcc/config/arm/t-linux 2006-11-09 23:14:27.000000000 +0100
-+++ gcc-4.3.3/gcc/config/arm/t-linux 2009-01-27 22:25:47.000000000 +0100
-@@ -3,7 +3,12 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
-+ _call_via_rX _interwork_call_via_rX \
-+ _lshrdi3 _ashrdi3 _ashldi3 \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc/4.3.5/320-alpha-signal_h.patch b/patches/gcc/4.3.5/320-alpha-signal_h.patch
deleted file mode 100644
index 2f4df3e..0000000
--- a/patches/gcc/4.3.5/320-alpha-signal_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Original patch from: ../4.3.2/320-alpha-signal_h.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.3.3/gcc/config/alpha/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h 2006-10-26 21:31:09.000000000 +0200
-+++ gcc-4.3.3/gcc/config/alpha/linux-unwind.h 2009-01-27 22:25:49.000000000 +0100
-@@ -29,6 +29,9 @@
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-+/* Don't use this if inhibit_libc is set
-+ The build for this target will fail trying to include missing headers */
-+#ifndef inhibit_libc
- #include <signal.h>
- #include <sys/ucontext.h>
-
-@@ -80,3 +83,4 @@
- fs->retaddr_column = 64;
- return _URC_NO_REASON;
- }
-+#endif /* inhibit_libc */
diff --git a/patches/gcc/4.3.5/330-unwind-for-uClibc.patch b/patches/gcc/4.3.5/330-unwind-for-uClibc.patch
deleted file mode 100644
index ac97c2f..0000000
--- a/patches/gcc/4.3.5/330-unwind-for-uClibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Original patch from: ../4.3.2/330-unwind-for-uClibc.patch
-
--= BEGIN original header =-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/t-linux-uclibc gcc-4.3.3/gcc/config/t-linux-uclibc
---- gcc-4.3.3.orig/gcc/config/t-linux-uclibc 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.3/gcc/config/t-linux-uclibc 2009-01-27 22:28:53.000000000 +0100
-@@ -0,0 +1,5 @@
-+# Remove glibc specific files added in t-linux
-+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
-+
-+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
-+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
-diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
---- gcc-4.3.3.orig/gcc/config.gcc 2009-01-27 22:25:37.000000000 +0100
-+++ gcc-4.3.3/gcc/config.gcc 2009-01-27 22:28:53.000000000 +0100
-@@ -2648,6 +2648,12 @@
- ;;
- esac
-
-+# Rather than hook into each target, just do it after all the linux
-+# targets have been processed
-+case ${target} in
-+ *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
-+esac
-+
- case ${target} in
- i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
- tmake_file="${tmake_file} i386/t-gmm_malloc"
diff --git a/patches/gcc/4.3.5/340-make-mno-spe-work-as-expected.patch b/patches/gcc/4.3.5/340-make-mno-spe-work-as-expected.patch
deleted file mode 100644
index ad2d203..0000000
--- a/patches/gcc/4.3.5/340-make-mno-spe-work-as-expected.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Original patch from: ../4.3.2/340-make-mno-spe-work-as-expected.patch
-
--= BEGIN original header =-
-2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
- Nathan Sidwell <nathan@codesourcery.com>
-
- * config/rs6000/rs6000.opt (mspe): Remove Var property.
- (misel): Likewise.
- * config/rs6000/rs6000.h (rs6000_spe): Declare.
- (rs6000_isel): Likewise.
- * config/rs6000/rs6000.c (rs6000_spe): New variable.
- (rs6000_isel): New variable.
- (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c gcc-4.3.3/gcc/config/rs6000/rs6000.c
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.c 2008-11-18 23:07:58.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.c 2009-01-27 22:28:55.000000000 +0100
-@@ -174,9 +174,15 @@
- /* Nonzero to use AltiVec ABI. */
- int rs6000_altivec_abi;
-
-+/* Nonzero if we want SPE SIMD instructions. */
-+int rs6000_spe;
-+
- /* Nonzero if we want SPE ABI extensions. */
- int rs6000_spe_abi;
-
-+/* Nonzero to use isel instructions. */
-+int rs6000_isel;
-+
- /* Nonzero if floating point operations are done in the GPRs. */
- int rs6000_float_gprs = 0;
-
-@@ -2144,11 +2150,21 @@
- rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
- break;
-
-+ case OPT_misel:
-+ rs6000_explicit_options.isel = true;
-+ rs6000_isel = value;
-+ break;
-+
- case OPT_misel_:
- rs6000_explicit_options.isel = true;
- rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
- break;
-
-+ case OPT_mspe:
-+ rs6000_explicit_options.spe = true;
-+ rs6000_spe = value;
-+ break;
-+
- case OPT_mspe_:
- rs6000_explicit_options.spe = true;
- rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h gcc-4.3.3/gcc/config/rs6000/rs6000.h
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.h 2008-01-26 18:18:35.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.h 2009-01-27 22:28:55.000000000 +0100
-@@ -349,6 +349,8 @@
- extern int rs6000_ieeequad;
- extern int rs6000_altivec_abi;
- extern int rs6000_spe_abi;
-+extern int rs6000_spe;
-+extern int rs6000_isel;
- extern int rs6000_float_gprs;
- extern int rs6000_alignment_flags;
- extern const char *rs6000_sched_insert_nops_str;
-diff -durN gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt gcc-4.3.3/gcc/config/rs6000/rs6000.opt
---- gcc-4.3.3.orig/gcc/config/rs6000/rs6000.opt 2007-10-31 08:56:01.000000000 +0100
-+++ gcc-4.3.3/gcc/config/rs6000/rs6000.opt 2009-01-27 22:28:55.000000000 +0100
-@@ -190,7 +190,7 @@
- -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
-
- misel
--Target Var(rs6000_isel)
-+Target
- Generate isel instructions
-
- misel=
-@@ -198,7 +198,7 @@
- -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
-
- mspe
--Target Var(rs6000_spe)
-+Target
- Generate SPE SIMD instructions on E500
-
- mpaired
diff --git a/patches/gcc/4.3.5/350-sh-without-headers.patch b/patches/gcc/4.3.5/350-sh-without-headers.patch
deleted file mode 100644
index 0bb860d..0000000
--- a/patches/gcc/4.3.5/350-sh-without-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Original patch from: ../4.3.2/350-sh-without-headers.patch
-
--= BEGIN original header =-
-On 20081011, Khem RAJ writes:
- You have to bar gcc trying to build unwinding at stage 1. Try the
- attached patch and see if it helps.
-
- gcc/config/sh/linux-unwind.h | 3 +++
- 1 file changed, 3 insertions(+)
-
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h gcc-4.3.3/gcc/config/sh/linux-unwind.h
---- gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h 2007-09-12 08:59:06.000000000 +0200
-+++ gcc-4.3.3/gcc/config/sh/linux-unwind.h 2009-01-27 22:28:57.000000000 +0100
-@@ -26,6 +26,8 @@
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
-
-+#ifndef inhibit_libc
-+
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -251,3 +253,4 @@
- return _URC_NO_REASON;
- }
- #endif /* defined (__SH5__) */
-+#endif /* ifndef inhibit_libc */
diff --git a/patches/gcc/4.3.5/380-pr37436.patch b/patches/gcc/4.3.5/380-pr37436.patch
deleted file mode 100644
index 99a016f..0000000
--- a/patches/gcc/4.3.5/380-pr37436.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-gcc svn 142778:
-
-PR target/37436
-* arm.c (arm_legitimate_index): Only accept addresses that are in
-canonical form.
-* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
-* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
-for operand1.
-(extendqisi2): Likewise.
-(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
-predicate for operand1.
-
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
---- gcc-4.3.3.orig/gcc/config/arm/arm.c 2008-06-11 07:52:55.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.c 2009-05-21 16:06:45.000000000 -0300
-@@ -3769,6 +3769,7 @@
- rtx xop1 = XEXP (x, 1);
-
- return ((arm_address_register_rtx_p (xop0, strict_p)
-+ && GET_CODE(xop1) == CONST_INT
- && arm_legitimate_index_p (mode, xop1, outer, strict_p))
- || (arm_address_register_rtx_p (xop1, strict_p)
- && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
---- gcc-4.3.3.orig/gcc/config/arm/arm.md 2007-09-04 01:44:47.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/arm.md 2009-05-21 16:06:45.000000000 -0300
-@@ -4199,7 +4199,7 @@
-
- (define_expand "extendqihi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:HI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4224,7 +4224,7 @@
-
- (define_insn "*arm_extendqihi_insn"
- [(set (match_operand:HI 0 "s_register_operand" "=r")
-- (sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4235,7 +4235,7 @@
-
- (define_expand "extendqisi2"
- [(set (match_dup 2)
-- (ashift:SI (match_operand:QI 1 "general_operand" "")
-+ (ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
- (const_int 24)))
- (set (match_operand:SI 0 "s_register_operand" "")
- (ashiftrt:SI (match_dup 2)
-@@ -4267,7 +4267,7 @@
-
- (define_insn "*arm_extendqisi"
- [(set (match_operand:SI 0 "s_register_operand" "=r")
-- (sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
-+ (sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
- "TARGET_ARM && arm_arch4 && !arm_arch6"
- "ldr%(sb%)\\t%0, %1"
- [(set_attr "type" "load_byte")
-@@ -4278,7 +4278,8 @@
-
- (define_insn "*arm_extendqisi_v6"
- [(set (match_operand:SI 0 "s_register_operand" "=r,r")
-- (sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
-+ (sign_extend:SI
-+ (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
- "TARGET_ARM && arm_arch6"
- "@
- sxtb%?\\t%0, %1
-diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
---- gcc-4.3.3.orig/gcc/config/arm/predicates.md 2007-08-02 07:49:31.000000000 -0300
-+++ gcc-4.3.3/gcc/config/arm/predicates.md 2009-05-21 16:06:45.000000000 -0300
-@@ -234,6 +234,10 @@
- (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
- 0)")))
-
-+(define_special_predicate "arm_reg_or_extendqisi_mem_op"
-+ (ior (match_operand 0 "arm_extendqisi_mem_op")
-+ (match_operand 0 "s_register_operand")))
-+
- (define_predicate "power_of_two_operand"
- (match_code "const_int")
- {
diff --git a/patches/gcc/4.3.5/390-unbreak-armv4t.patch b/patches/gcc/4.3.5/390-unbreak-armv4t.patch
deleted file mode 100644
index af14e0d..0000000
--- a/patches/gcc/4.3.5/390-unbreak-armv4t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:44.000000000 +0200
-+++ gcc-4.3.2/gcc/config/arm/linux-eabi.h 2009-09-08 23:46:51.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.3.5/400-ecjx-host-cc.patch b/patches/gcc/4.3.5/400-ecjx-host-cc.patch
deleted file mode 100644
index 793069b..0000000
--- a/patches/gcc/4.3.5/400-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur gcc-4.3.4-orig/libjava/Makefile.in gcc-4.3.4/libjava/Makefile.in
---- gcc-4.3.4-orig/libjava/Makefile.in 2009-08-04 04:12:27.000000000 -0700
-+++ gcc-4.3.4/libjava/Makefile.in 2009-09-23 22:03:15.750951483 -0700
-@@ -8874,6 +8874,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.3.5/410-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.3.5/410-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.3.5/410-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.3.5/420-libgcc_eh.a.patch b/patches/gcc/4.3.5/420-libgcc_eh.a.patch
deleted file mode 100644
index 854198a..0000000
--- a/patches/gcc/4.3.5/420-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.3.2.orig//libgcc/Makefile.in gcc-4.3.2/libgcc/Makefile.in
---- gcc-4.3.2.orig//libgcc/Makefile.in 2008-06-17 11:32:34.000000000 +0200
-+++ gcc-4.3.2/libgcc/Makefile.in 2011-09-02 12:27:39.296538955 +0200
-@@ -705,8 +705,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -875,10 +876,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -893,6 +890,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.0/100-alpha-mieee-default.patch b/patches/gcc/4.4.0/100-alpha-mieee-default.patch
deleted file mode 100644
index 7cf0dc4..0000000
--- a/patches/gcc/4.4.0/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.h gcc-4.4.0/gcc/config/alpha/alpha.h
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.0/gcc/config/alpha/alpha.h 2009-05-27 21:37:58.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.opt gcc-4.4.0/gcc/config/alpha/alpha.opt
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/alpha/alpha.opt 2009-05-27 21:37:58.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.0/110-trampolinewarn.patch b/patches/gcc/4.4.0/110-trampolinewarn.patch
deleted file mode 100644
index f3ef499..0000000
--- a/patches/gcc/4.4.0/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/builtins.c gcc-4.4.0/gcc/builtins.c
---- gcc-4.4.0.orig/gcc/builtins.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/builtins.c 2009-05-27 21:38:01.000000000 +0200
-@@ -5768,6 +5768,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.0.orig/gcc/common.opt gcc-4.4.0/gcc/common.opt
---- gcc-4.4.0.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.0/gcc/common.opt 2009-05-27 21:38:01.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.0/120-java-nomulti.patch b/patches/gcc/4.4.0/120-java-nomulti.patch
deleted file mode 100644
index 645479c..0000000
--- a/patches/gcc/4.4.0/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libjava/configure 2009-05-27 21:38:03.000000000 +0200
-@@ -1021,6 +1021,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1973,6 +1975,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac 2009-04-09 23:54:28.000000000 +0200
-+++ gcc-4.4.0/libjava/configure.ac 2009-05-27 21:38:03.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.0/130-cross-compile.patch b/patches/gcc/4.4.0/130-cross-compile.patch
deleted file mode 100644
index 76fe7c8..0000000
--- a/patches/gcc/4.4.0/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:06.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:06.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
---- gcc-4.4.0.orig/gcc/unwind-dw2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2.c 2009-05-27 21:38:06.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.0/140-default-format-security.patch b/patches/gcc/4.4.0/140-default-format-security.patch
deleted file mode 100644
index 51942f5..0000000
--- a/patches/gcc/4.4.0/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/c-common.c gcc-4.4.0/gcc/c-common.c
---- gcc-4.4.0.orig/gcc/c-common.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/c-common.c 2009-05-27 21:38:08.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.0.orig/gcc/c.opt gcc-4.4.0/gcc/c.opt
---- gcc-4.4.0.orig/gcc/c.opt 2009-03-18 22:14:53.000000000 +0100
-+++ gcc-4.4.0/gcc/c.opt 2009-05-27 21:38:08.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:08.000000000 +0200
-@@ -2867,6 +2867,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2920,6 +2923,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.0/150-default-fortify-source.patch b/patches/gcc/4.4.0/150-default-fortify-source.patch
deleted file mode 100644
index a68227f..0000000
--- a/patches/gcc/4.4.0/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-@@ -5411,6 +5411,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.0.orig/gcc/gcc.c gcc-4.4.0/gcc/gcc.c
---- gcc-4.4.0.orig/gcc/gcc.c 2009-03-17 22:25:59.000000000 +0100
-+++ gcc-4.4.0/gcc/gcc.c 2009-05-27 21:38:11.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.0/160-netbsd-symbolic.patch b/patches/gcc/4.4.0/160-netbsd-symbolic.patch
deleted file mode 100644
index fe1f1cb..0000000
--- a/patches/gcc/4.4.0/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/netbsd-elf.h gcc-4.4.0/gcc/config/netbsd-elf.h
---- gcc-4.4.0.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.0/gcc/config/netbsd-elf.h 2009-05-27 21:38:14.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.0/170-sparc64-bsd.patch b/patches/gcc/4.4.0/170-sparc64-bsd.patch
deleted file mode 100644
index 99a5eea..0000000
--- a/patches/gcc/4.4.0/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sparc/freebsd.h gcc-4.4.0/gcc/config/sparc/freebsd.h
---- gcc-4.4.0.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sparc/freebsd.h 2009-05-27 21:38:16.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.0/180-libgomp-no-werror.patch b/patches/gcc/4.4.0/180-libgomp-no-werror.patch
deleted file mode 100644
index 9d2adf0..0000000
--- a/patches/gcc/4.4.0/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
---- gcc-4.4.0.orig/libgomp/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libgomp/configure 2009-05-27 21:38:19.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.0/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.0/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8db1ccc..0000000
--- a/patches/gcc/4.4.0/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
---- gcc-4.4.0.orig/gcc/stmt.c 2009-02-27 20:49:42.000000000 +0100
-+++ gcc-4.4.0/gcc/stmt.c 2009-05-27 21:38:21.000000000 +0200
-@@ -2376,7 +2376,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2942,6 +2946,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.0/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.0/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 02784be..0000000
--- a/patches/gcc/4.4.0/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.0.orig/include/libiberty.h gcc-4.4.0/include/libiberty.h
---- gcc-4.4.0.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.0/include/libiberty.h 2009-05-27 21:38:24.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.0/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.0/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 06eafc5..0000000
--- a/patches/gcc/4.4.0/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
---- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-05-27 21:38:26.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.0/220-libiberty-pic.patch b/patches/gcc/4.4.0/220-libiberty-pic.patch
deleted file mode 100644
index ff13a4f..0000000
--- a/patches/gcc/4.4.0/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/libiberty/Makefile.in gcc-4.4.0/libiberty/Makefile.in
---- gcc-4.4.0.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.0/libiberty/Makefile.in 2009-05-27 21:38:29.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.0/230-superh-default-multilib.patch b/patches/gcc/4.4.0/230-superh-default-multilib.patch
deleted file mode 100644
index 7c719e8..0000000
--- a/patches/gcc/4.4.0/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:31.000000000 +0200
-@@ -2121,7 +2121,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.0/240-libstdc++-pic.patch b/patches/gcc/4.4.0/240-libstdc++-pic.patch
deleted file mode 100644
index b951dfc..0000000
--- a/patches/gcc/4.4.0/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.am 2009-05-27 21:38:34.000000000 +0200
-@@ -351,6 +351,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in 2009-01-17 03:03:25.000000000 +0100
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.in 2009-05-27 21:38:34.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -942,6 +942,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.0/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.0/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 9b80e6c..0000000
--- a/patches/gcc/4.4.0/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-05-27 21:38:37.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h 2009-05-27 21:38:37.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.0/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.0/260-sh-libgcc-stacks.patch
deleted file mode 100644
index 62af2c9..0000000
--- a/patches/gcc/4.4.0/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.0/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/lib1funcs.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.0/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/linux-atomic.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.0/270-sh-pr24836.patch b/patches/gcc/4.4.0/270-sh-pr24836.patch
deleted file mode 100644
index 3c745ab..0000000
--- a/patches/gcc/4.4.0/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:42.000000000 +0200
-@@ -22205,7 +22205,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:42.000000000 +0200
-@@ -2673,7 +2673,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.0/280-freebsd.patch b/patches/gcc/4.4.0/280-freebsd.patch
deleted file mode 100644
index 39d9d0b..0000000
--- a/patches/gcc/4.4.0/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:45.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
---- gcc-4.4.0.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-freebsd-eh 2009-05-27 21:38:45.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-05-27 21:38:34.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:45.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1042,6 +1042,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
---- gcc-4.4.0.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/crtstuff.c 2009-05-27 21:38:45.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c 2009-05-27 21:38:45.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.0/290-freebsd.patch b/patches/gcc/4.4.0/290-freebsd.patch
deleted file mode 100644
index ad1564b..0000000
--- a/patches/gcc/4.4.0/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.0/300-pr40105.patch b/patches/gcc/4.4.0/300-pr40105.patch
deleted file mode 100644
index 1acbad6..0000000
--- a/patches/gcc/4.4.0/300-pr40105.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/Makefile.in gcc-4.4.0/gcc/Makefile.in
---- gcc-4.4.0.orig/gcc/Makefile.in 2009-03-25 13:00:32.000000000 +0100
-+++ gcc-4.4.0/gcc/Makefile.in 2009-05-27 21:38:50.000000000 +0200
-@@ -2785,7 +2785,8 @@
- value-prof.h $(TREE_INLINE_H) $(TARGET_H)
- cfgrtl.o : cfgrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
- $(FLAGS_H) insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h \
-- output.h $(TOPLEV_H) $(FUNCTION_H) except.h $(TM_P_H) insn-config.h $(EXPR_H) \
-+ output.h $(TOPLEV_H) $(FUNCTION_H) except.h $(TM_P_H) $(INSN_ATTR_H) \
-+ insn-config.h $(EXPR_H) \
- $(CFGLAYOUT_H) $(CFGLOOP_H) $(OBSTACK_H) $(TARGET_H) $(TREE_H) \
- tree-pass.h $(DF_H) $(GGC_H)
- cfganal.o : cfganal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-diff -durN gcc-4.4.0.orig/gcc/cfgrtl.c gcc-4.4.0/gcc/cfgrtl.c
---- gcc-4.4.0.orig/gcc/cfgrtl.c 2008-12-12 22:16:09.000000000 +0100
-+++ gcc-4.4.0/gcc/cfgrtl.c 2009-05-27 21:38:50.000000000 +0200
-@@ -53,6 +53,7 @@
- #include "toplev.h"
- #include "tm_p.h"
- #include "obstack.h"
-+#include "insn-attr.h"
- #include "insn-config.h"
- #include "cfglayout.h"
- #include "expr.h"
-@@ -427,13 +428,27 @@
- return 0;
- }
-
-+static unsigned int
-+rest_of_pass_free_cfg (void)
-+{
-+#ifdef DELAY_SLOTS
-+ /* The resource.c machinery uses DF but the CFG isn't guaranteed to be
-+ valid at that point so it would be too late to call df_analyze. */
-+ if (optimize > 0 && flag_delayed_branch)
-+ df_analyze ();
-+#endif
-+
-+ free_bb_for_insn ();
-+ return 0;
-+}
-+
- struct rtl_opt_pass pass_free_cfg =
- {
- {
- RTL_PASS,
- NULL, /* name */
- NULL, /* gate */
-- free_bb_for_insn, /* execute */
-+ rest_of_pass_free_cfg, /* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
-diff -durN gcc-4.4.0.orig/gcc/resource.c gcc-4.4.0/gcc/resource.c
---- gcc-4.4.0.orig/gcc/resource.c 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.0/gcc/resource.c 2009-05-27 21:38:50.000000000 +0200
-@@ -135,8 +135,6 @@
- static int
- find_basic_block (rtx insn, int search_limit)
- {
-- basic_block bb;
--
- /* Scan backwards to the previous BARRIER. Then see if we can find a
- label that starts a basic block. Return the basic block number. */
- for (insn = prev_nonnote_insn (insn);
-@@ -157,11 +155,8 @@
- for (insn = next_nonnote_insn (insn);
- insn && LABEL_P (insn);
- insn = next_nonnote_insn (insn))
-- {
-- FOR_EACH_BB (bb)
-- if (insn == BB_HEAD (bb))
-- return bb->index;
-- }
-+ if (BLOCK_FOR_INSN (insn))
-+ return BLOCK_FOR_INSN (insn)->index;
-
- return -1;
- }
-@@ -848,13 +843,12 @@
- (with no intervening active insns) to see if any of them start a basic
- block. If we hit the start of the function first, we use block 0.
-
-- Once we have found a basic block and a corresponding first insns, we can
-- accurately compute the live status from basic_block_live_regs and
-- reg_renumber. (By starting at a label following a BARRIER, we are immune
-- to actions taken by reload and jump.) Then we scan all insns between
-- that point and our target. For each CLOBBER (or for call-clobbered regs
-- when we pass a CALL_INSN), mark the appropriate registers are dead. For
-- a SET, mark them as live.
-+ Once we have found a basic block and a corresponding first insn, we can
-+ accurately compute the live status (by starting at a label following a
-+ BARRIER, we are immune to actions taken by reload and jump.) Then we
-+ scan all insns between that point and our target. For each CLOBBER (or
-+ for call-clobbered regs when we pass a CALL_INSN), mark the appropriate
-+ registers are dead. For a SET, mark them as live.
-
- We have to be careful when using REG_DEAD notes because they are not
- updated by such things as find_equiv_reg. So keep track of registers
-@@ -954,13 +948,10 @@
- TARGET. Otherwise, we must assume everything is live. */
- if (b != -1)
- {
-- regset regs_live = DF_LR_IN (BASIC_BLOCK (b));
-+ regset regs_live = df_get_live_in (BASIC_BLOCK (b));
- rtx start_insn, stop_insn;
-
-- /* Compute hard regs live at start of block -- this is the real hard regs
-- marked live, plus live pseudo regs that have been renumbered to
-- hard regs. */
--
-+ /* Compute hard regs live at start of block. */
- REG_SET_TO_HARD_REG_SET (current_live_regs, regs_live);
-
- /* Get starting and ending insn, handling the case where each might
-@@ -1046,10 +1037,24 @@
-
- else if (LABEL_P (real_insn))
- {
-+ basic_block bb;
-+
- /* A label clobbers the pending dead registers since neither
- reload nor jump will propagate a value across a label. */
- AND_COMPL_HARD_REG_SET (current_live_regs, pending_dead_regs);
- CLEAR_HARD_REG_SET (pending_dead_regs);
-+
-+ /* We must conservatively assume that all registers that used
-+ to be live here still are. The fallthrough edge may have
-+ left a live register uninitialized. */
-+ bb = BLOCK_FOR_INSN (real_insn);
-+ if (bb)
-+ {
-+ HARD_REG_SET extra_live;
-+
-+ REG_SET_TO_HARD_REG_SET (extra_live, df_get_live_in (bb));
-+ IOR_HARD_REG_SET (current_live_regs, extra_live);
-+ }
- }
-
- /* The beginning of the epilogue corresponds to the end of the
-@@ -1121,6 +1126,7 @@
- init_resource_info (rtx epilogue_insn)
- {
- int i;
-+ basic_block bb;
-
- /* Indicate what resources are required to be valid at the end of the current
- function. The condition code never is and memory always is. If the
-@@ -1189,6 +1195,11 @@
- /* Allocate and initialize the tables used by mark_target_live_regs. */
- target_hash_table = XCNEWVEC (struct target_info *, TARGET_HASH_PRIME);
- bb_ticks = XCNEWVEC (int, last_basic_block);
-+
-+ /* Set the BLOCK_FOR_INSN of each label that starts a basic block. */
-+ FOR_EACH_BB (bb)
-+ if (LABEL_P (BB_HEAD (bb)))
-+ BLOCK_FOR_INSN (BB_HEAD (bb)) = bb;
- }
-
- /* Free up the resources allocated to mark_target_live_regs (). This
-@@ -1197,6 +1208,8 @@
- void
- free_resource_info (void)
- {
-+ basic_block bb;
-+
- if (target_hash_table != NULL)
- {
- int i;
-@@ -1222,6 +1235,10 @@
- free (bb_ticks);
- bb_ticks = NULL;
- }
-+
-+ FOR_EACH_BB (bb)
-+ if (LABEL_P (BB_HEAD (bb)))
-+ BLOCK_FOR_INSN (BB_HEAD (bb)) = NULL;
- }
-
- /* Clear any hashed information that we have stored for INSN. */
diff --git a/patches/gcc/4.4.0/310-uclibc-conf.patch b/patches/gcc/4.4.0/310-uclibc-conf.patch
deleted file mode 100644
index e3f3b91..0000000
--- a/patches/gcc/4.4.0/310-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.0.orig/contrib/regression/objs-gcc.sh gcc-4.4.0/contrib/regression/objs-gcc.sh
---- gcc-4.4.0.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/contrib/regression/objs-gcc.sh 2009-05-27 21:38:53.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.0.orig/libjava/classpath/ltconfig gcc-4.4.0/libjava/classpath/ltconfig
---- gcc-4.4.0.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.0/libjava/classpath/ltconfig 2009-05-27 21:38:53.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.0/320-missing-execinfo_h.patch b/patches/gcc/4.4.0/320-missing-execinfo_h.patch
deleted file mode 100644
index 009335e..0000000
--- a/patches/gcc/4.4.0/320-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/boehm-gc/include/gc.h gcc-4.4.0/boehm-gc/include/gc.h
---- gcc-4.4.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.0/boehm-gc/include/gc.h 2009-05-27 21:38:55.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.0/330-c99-snprintf.patch b/patches/gcc/4.4.0/330-c99-snprintf.patch
deleted file mode 100644
index 4928f4b..0000000
--- a/patches/gcc/4.4.0/330-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.0/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/include/c_global/cstdio 2009-05-27 21:38:58.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.0/340-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.0/340-libmudflap-susv3-legacy.patch
deleted file mode 100644
index f3a4e32..0000000
--- a/patches/gcc/4.4.0/340-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
---- gcc-4.4.0.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libmudflap/mf-hooks2.c 2009-05-27 21:39:00.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.0/350-index_macro.patch b/patches/gcc/4.4.0/350-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.4.0/350-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.0/360-arm-bigendian.patch b/patches/gcc/4.4.0/360-arm-bigendian.patch
deleted file mode 100644
index f0f10aa..0000000
--- a/patches/gcc/4.4.0/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.4.2.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.2/gcc/config/arm/linux-elf.h 2009-12-31 14:19:20.000000000 +0100
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -ru gcc-4.4.2.orig/gcc/config.gcc gcc-4.4.2/gcc/config.gcc
---- gcc-4.4.2.orig/gcc/config.gcc 2009-12-31 14:43:17.000000000 +0100
-+++ gcc-4.4.2/gcc/config.gcc 2010-01-05 09:27:42.000000000 +0100
-@@ -733,6 +733,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
-
diff --git a/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 7a71d2d..0000000
--- a/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff --git a/Makefile.in b/Makefile.in
-index e5fa1d3..dbfc1f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 15102e5..452d47c 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.0/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.0/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index 63d9121..0000000
--- a/patches/gcc/4.4.0/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -rdup gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver gcc-4.4.0/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver 2005-10-31 18:03:08.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-slibgcc-elf-ver 2008-10-07 19:28:13.000000000 +0200
-@@ -9,7 +9,7 @@ SHLIB_MAP = @shlib_map_file@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
-
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- -Wl,--soname=$(SHLIB_SONAME) \
-diff -rdup gcc-4.4.0.old/libgcc/configure gcc-4.4.0/libgcc/configure
---- gcc-4.4.0.old/libgcc/configure 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure 2008-10-07 19:40:48.000000000 +0200
-@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3522,6 +3522,39 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4242,6 +4275,7 @@ s,@enable_decimal_float@,$enable_decimal
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -rdup gcc-4.4.0.old/libgcc/configure.ac gcc-4.4.0/libgcc/configure.ac
---- gcc-4.4.0.old/libgcc/configure.ac 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure.ac 2008-10-07 19:34:48.000000000 +0200
-@@ -203,6 +203,27 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -rdup gcc-4.4.0.old/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.old/libgcc/Makefile.in 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2008-10-07 19:28:13.000000000 +0200
-@@ -40,6 +40,7 @@ enable_shared = @enable_shared@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -786,9 +787,10 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.0/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.0/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.0/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.0/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.0/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.0/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.0/410-libgcc_eh.a.patch b/patches/gcc/4.4.0/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.0/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.1/100-alpha-mieee-default.patch b/patches/gcc/4.4.1/100-alpha-mieee-default.patch
deleted file mode 100644
index 7cf0dc4..0000000
--- a/patches/gcc/4.4.1/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.h gcc-4.4.0/gcc/config/alpha/alpha.h
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.0/gcc/config/alpha/alpha.h 2009-05-27 21:37:58.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.opt gcc-4.4.0/gcc/config/alpha/alpha.opt
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/alpha/alpha.opt 2009-05-27 21:37:58.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.1/110-trampolinewarn.patch b/patches/gcc/4.4.1/110-trampolinewarn.patch
deleted file mode 100644
index f3ef499..0000000
--- a/patches/gcc/4.4.1/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/builtins.c gcc-4.4.0/gcc/builtins.c
---- gcc-4.4.0.orig/gcc/builtins.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/builtins.c 2009-05-27 21:38:01.000000000 +0200
-@@ -5768,6 +5768,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.0.orig/gcc/common.opt gcc-4.4.0/gcc/common.opt
---- gcc-4.4.0.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.0/gcc/common.opt 2009-05-27 21:38:01.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.1/120-java-nomulti.patch b/patches/gcc/4.4.1/120-java-nomulti.patch
deleted file mode 100644
index 645479c..0000000
--- a/patches/gcc/4.4.1/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libjava/configure 2009-05-27 21:38:03.000000000 +0200
-@@ -1021,6 +1021,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1973,6 +1975,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac 2009-04-09 23:54:28.000000000 +0200
-+++ gcc-4.4.0/libjava/configure.ac 2009-05-27 21:38:03.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.1/130-cross-compile.patch b/patches/gcc/4.4.1/130-cross-compile.patch
deleted file mode 100644
index 76fe7c8..0000000
--- a/patches/gcc/4.4.1/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:06.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:06.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
---- gcc-4.4.0.orig/gcc/unwind-dw2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2.c 2009-05-27 21:38:06.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.1/140-default-format-security.patch b/patches/gcc/4.4.1/140-default-format-security.patch
deleted file mode 100644
index 51942f5..0000000
--- a/patches/gcc/4.4.1/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/c-common.c gcc-4.4.0/gcc/c-common.c
---- gcc-4.4.0.orig/gcc/c-common.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/c-common.c 2009-05-27 21:38:08.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.0.orig/gcc/c.opt gcc-4.4.0/gcc/c.opt
---- gcc-4.4.0.orig/gcc/c.opt 2009-03-18 22:14:53.000000000 +0100
-+++ gcc-4.4.0/gcc/c.opt 2009-05-27 21:38:08.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:08.000000000 +0200
-@@ -2867,6 +2867,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2920,6 +2923,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.1/150-default-fortify-source.patch b/patches/gcc/4.4.1/150-default-fortify-source.patch
deleted file mode 100644
index a68227f..0000000
--- a/patches/gcc/4.4.1/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-@@ -5411,6 +5411,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.0.orig/gcc/gcc.c gcc-4.4.0/gcc/gcc.c
---- gcc-4.4.0.orig/gcc/gcc.c 2009-03-17 22:25:59.000000000 +0100
-+++ gcc-4.4.0/gcc/gcc.c 2009-05-27 21:38:11.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.1/160-netbsd-symbolic.patch b/patches/gcc/4.4.1/160-netbsd-symbolic.patch
deleted file mode 100644
index fe1f1cb..0000000
--- a/patches/gcc/4.4.1/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/netbsd-elf.h gcc-4.4.0/gcc/config/netbsd-elf.h
---- gcc-4.4.0.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.0/gcc/config/netbsd-elf.h 2009-05-27 21:38:14.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.1/170-sparc64-bsd.patch b/patches/gcc/4.4.1/170-sparc64-bsd.patch
deleted file mode 100644
index 99a5eea..0000000
--- a/patches/gcc/4.4.1/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sparc/freebsd.h gcc-4.4.0/gcc/config/sparc/freebsd.h
---- gcc-4.4.0.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sparc/freebsd.h 2009-05-27 21:38:16.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.1/180-libgomp-no-werror.patch b/patches/gcc/4.4.1/180-libgomp-no-werror.patch
deleted file mode 100644
index 9d2adf0..0000000
--- a/patches/gcc/4.4.1/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
---- gcc-4.4.0.orig/libgomp/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libgomp/configure 2009-05-27 21:38:19.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.1/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.1/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8db1ccc..0000000
--- a/patches/gcc/4.4.1/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
---- gcc-4.4.0.orig/gcc/stmt.c 2009-02-27 20:49:42.000000000 +0100
-+++ gcc-4.4.0/gcc/stmt.c 2009-05-27 21:38:21.000000000 +0200
-@@ -2376,7 +2376,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2942,6 +2946,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.1/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.1/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 02784be..0000000
--- a/patches/gcc/4.4.1/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.0.orig/include/libiberty.h gcc-4.4.0/include/libiberty.h
---- gcc-4.4.0.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.0/include/libiberty.h 2009-05-27 21:38:24.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.1/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.1/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 06eafc5..0000000
--- a/patches/gcc/4.4.1/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
---- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-05-27 21:38:26.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.1/220-libiberty-pic.patch b/patches/gcc/4.4.1/220-libiberty-pic.patch
deleted file mode 100644
index ff13a4f..0000000
--- a/patches/gcc/4.4.1/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/libiberty/Makefile.in gcc-4.4.0/libiberty/Makefile.in
---- gcc-4.4.0.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.0/libiberty/Makefile.in 2009-05-27 21:38:29.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.1/230-superh-default-multilib.patch b/patches/gcc/4.4.1/230-superh-default-multilib.patch
deleted file mode 100644
index 7c719e8..0000000
--- a/patches/gcc/4.4.1/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:31.000000000 +0200
-@@ -2121,7 +2121,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.1/240-libstdc++-pic.patch b/patches/gcc/4.4.1/240-libstdc++-pic.patch
deleted file mode 100644
index b951dfc..0000000
--- a/patches/gcc/4.4.1/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.am 2009-05-27 21:38:34.000000000 +0200
-@@ -351,6 +351,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in 2009-01-17 03:03:25.000000000 +0100
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.in 2009-05-27 21:38:34.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -942,6 +942,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.1/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.1/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 9b80e6c..0000000
--- a/patches/gcc/4.4.1/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-05-27 21:38:37.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h 2009-05-27 21:38:37.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.1/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.1/260-sh-libgcc-stacks.patch
deleted file mode 100644
index 62af2c9..0000000
--- a/patches/gcc/4.4.1/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.0/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/lib1funcs.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.0/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/linux-atomic.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.1/270-sh-pr24836.patch b/patches/gcc/4.4.1/270-sh-pr24836.patch
deleted file mode 100644
index 3c745ab..0000000
--- a/patches/gcc/4.4.1/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:42.000000000 +0200
-@@ -22205,7 +22205,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:42.000000000 +0200
-@@ -2673,7 +2673,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.1/280-freebsd.patch b/patches/gcc/4.4.1/280-freebsd.patch
deleted file mode 100644
index 39d9d0b..0000000
--- a/patches/gcc/4.4.1/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:45.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
---- gcc-4.4.0.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-freebsd-eh 2009-05-27 21:38:45.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-05-27 21:38:34.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:45.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1042,6 +1042,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
---- gcc-4.4.0.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/crtstuff.c 2009-05-27 21:38:45.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c 2009-05-27 21:38:45.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.1/290-freebsd.patch b/patches/gcc/4.4.1/290-freebsd.patch
deleted file mode 100644
index ad1564b..0000000
--- a/patches/gcc/4.4.1/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.1/300-uclibc-conf.patch b/patches/gcc/4.4.1/300-uclibc-conf.patch
deleted file mode 100644
index e3f3b91..0000000
--- a/patches/gcc/4.4.1/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.0.orig/contrib/regression/objs-gcc.sh gcc-4.4.0/contrib/regression/objs-gcc.sh
---- gcc-4.4.0.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/contrib/regression/objs-gcc.sh 2009-05-27 21:38:53.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.0.orig/libjava/classpath/ltconfig gcc-4.4.0/libjava/classpath/ltconfig
---- gcc-4.4.0.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.0/libjava/classpath/ltconfig 2009-05-27 21:38:53.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.1/310-missing-execinfo_h.patch b/patches/gcc/4.4.1/310-missing-execinfo_h.patch
deleted file mode 100644
index 009335e..0000000
--- a/patches/gcc/4.4.1/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/boehm-gc/include/gc.h gcc-4.4.0/boehm-gc/include/gc.h
---- gcc-4.4.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.0/boehm-gc/include/gc.h 2009-05-27 21:38:55.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.1/320-c99-snprintf.patch b/patches/gcc/4.4.1/320-c99-snprintf.patch
deleted file mode 100644
index 4928f4b..0000000
--- a/patches/gcc/4.4.1/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.0/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/include/c_global/cstdio 2009-05-27 21:38:58.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.1/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.1/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index f3a4e32..0000000
--- a/patches/gcc/4.4.1/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
---- gcc-4.4.0.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libmudflap/mf-hooks2.c 2009-05-27 21:39:00.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.1/340-ecjx-host-cc.patch b/patches/gcc/4.4.1/340-ecjx-host-cc.patch
deleted file mode 100644
index eaf8ed4..0000000
--- a/patches/gcc/4.4.1/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur gcc-4.4.1-orig/libjava/Makefile.in gcc-4.4.1/libjava/Makefile.in
---- gcc-4.4.1-orig/libjava/Makefile.in 2009-08-04 04:12:27.000000000 -0700
-+++ gcc-4.4.1/libjava/Makefile.in 2009-09-23 22:03:15.750951483 -0700
-@@ -8874,6 +8874,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.1/350-index_macro.patch b/patches/gcc/4.4.1/350-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.4.1/350-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.1/360-arm-bigendian.patch b/patches/gcc/4.4.1/360-arm-bigendian.patch
deleted file mode 100644
index f0f10aa..0000000
--- a/patches/gcc/4.4.1/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.4.2.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.2/gcc/config/arm/linux-elf.h 2009-12-31 14:19:20.000000000 +0100
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -ru gcc-4.4.2.orig/gcc/config.gcc gcc-4.4.2/gcc/config.gcc
---- gcc-4.4.2.orig/gcc/config.gcc 2009-12-31 14:43:17.000000000 +0100
-+++ gcc-4.4.2/gcc/config.gcc 2010-01-05 09:27:42.000000000 +0100
-@@ -733,6 +733,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
-
diff --git a/patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 7a71d2d..0000000
--- a/patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff --git a/Makefile.in b/Makefile.in
-index e5fa1d3..dbfc1f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 15102e5..452d47c 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.1/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.1/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index 63d9121..0000000
--- a/patches/gcc/4.4.1/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -rdup gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver gcc-4.4.0/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver 2005-10-31 18:03:08.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-slibgcc-elf-ver 2008-10-07 19:28:13.000000000 +0200
-@@ -9,7 +9,7 @@ SHLIB_MAP = @shlib_map_file@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
-
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- -Wl,--soname=$(SHLIB_SONAME) \
-diff -rdup gcc-4.4.0.old/libgcc/configure gcc-4.4.0/libgcc/configure
---- gcc-4.4.0.old/libgcc/configure 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure 2008-10-07 19:40:48.000000000 +0200
-@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3522,6 +3522,39 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4242,6 +4275,7 @@ s,@enable_decimal_float@,$enable_decimal
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -rdup gcc-4.4.0.old/libgcc/configure.ac gcc-4.4.0/libgcc/configure.ac
---- gcc-4.4.0.old/libgcc/configure.ac 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure.ac 2008-10-07 19:34:48.000000000 +0200
-@@ -203,6 +203,27 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -rdup gcc-4.4.0.old/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.old/libgcc/Makefile.in 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2008-10-07 19:28:13.000000000 +0200
-@@ -40,6 +40,7 @@ enable_shared = @enable_shared@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -786,9 +787,10 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.1/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.1/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.1/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.1/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.1/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.1/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.1/410-libgcc_eh.a.patch b/patches/gcc/4.4.1/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.1/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.2/100-alpha-mieee-default.patch b/patches/gcc/4.4.2/100-alpha-mieee-default.patch
deleted file mode 100644
index 7cf0dc4..0000000
--- a/patches/gcc/4.4.2/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.h gcc-4.4.0/gcc/config/alpha/alpha.h
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.0/gcc/config/alpha/alpha.h 2009-05-27 21:37:58.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.opt gcc-4.4.0/gcc/config/alpha/alpha.opt
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/alpha/alpha.opt 2009-05-27 21:37:58.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.2/110-trampolinewarn.patch b/patches/gcc/4.4.2/110-trampolinewarn.patch
deleted file mode 100644
index f3ef499..0000000
--- a/patches/gcc/4.4.2/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/builtins.c gcc-4.4.0/gcc/builtins.c
---- gcc-4.4.0.orig/gcc/builtins.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/builtins.c 2009-05-27 21:38:01.000000000 +0200
-@@ -5768,6 +5768,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.0.orig/gcc/common.opt gcc-4.4.0/gcc/common.opt
---- gcc-4.4.0.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.0/gcc/common.opt 2009-05-27 21:38:01.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.2/120-java-nomulti.patch b/patches/gcc/4.4.2/120-java-nomulti.patch
deleted file mode 100644
index 645479c..0000000
--- a/patches/gcc/4.4.2/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libjava/configure 2009-05-27 21:38:03.000000000 +0200
-@@ -1021,6 +1021,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1973,6 +1975,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac 2009-04-09 23:54:28.000000000 +0200
-+++ gcc-4.4.0/libjava/configure.ac 2009-05-27 21:38:03.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.2/130-cross-compile.patch b/patches/gcc/4.4.2/130-cross-compile.patch
deleted file mode 100644
index 76fe7c8..0000000
--- a/patches/gcc/4.4.2/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:06.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:06.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
---- gcc-4.4.0.orig/gcc/unwind-dw2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2.c 2009-05-27 21:38:06.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.2/140-default-format-security.patch b/patches/gcc/4.4.2/140-default-format-security.patch
deleted file mode 100644
index 51942f5..0000000
--- a/patches/gcc/4.4.2/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/c-common.c gcc-4.4.0/gcc/c-common.c
---- gcc-4.4.0.orig/gcc/c-common.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/c-common.c 2009-05-27 21:38:08.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.0.orig/gcc/c.opt gcc-4.4.0/gcc/c.opt
---- gcc-4.4.0.orig/gcc/c.opt 2009-03-18 22:14:53.000000000 +0100
-+++ gcc-4.4.0/gcc/c.opt 2009-05-27 21:38:08.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:08.000000000 +0200
-@@ -2867,6 +2867,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2920,6 +2923,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.2/150-default-fortify-source.patch b/patches/gcc/4.4.2/150-default-fortify-source.patch
deleted file mode 100644
index a68227f..0000000
--- a/patches/gcc/4.4.2/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-@@ -5411,6 +5411,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.0.orig/gcc/gcc.c gcc-4.4.0/gcc/gcc.c
---- gcc-4.4.0.orig/gcc/gcc.c 2009-03-17 22:25:59.000000000 +0100
-+++ gcc-4.4.0/gcc/gcc.c 2009-05-27 21:38:11.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.2/160-netbsd-symbolic.patch b/patches/gcc/4.4.2/160-netbsd-symbolic.patch
deleted file mode 100644
index fe1f1cb..0000000
--- a/patches/gcc/4.4.2/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/netbsd-elf.h gcc-4.4.0/gcc/config/netbsd-elf.h
---- gcc-4.4.0.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.0/gcc/config/netbsd-elf.h 2009-05-27 21:38:14.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.2/170-sparc64-bsd.patch b/patches/gcc/4.4.2/170-sparc64-bsd.patch
deleted file mode 100644
index 99a5eea..0000000
--- a/patches/gcc/4.4.2/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sparc/freebsd.h gcc-4.4.0/gcc/config/sparc/freebsd.h
---- gcc-4.4.0.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sparc/freebsd.h 2009-05-27 21:38:16.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.2/180-libgomp-no-werror.patch b/patches/gcc/4.4.2/180-libgomp-no-werror.patch
deleted file mode 100644
index 9d2adf0..0000000
--- a/patches/gcc/4.4.2/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
---- gcc-4.4.0.orig/libgomp/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libgomp/configure 2009-05-27 21:38:19.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.2/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.2/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8db1ccc..0000000
--- a/patches/gcc/4.4.2/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
---- gcc-4.4.0.orig/gcc/stmt.c 2009-02-27 20:49:42.000000000 +0100
-+++ gcc-4.4.0/gcc/stmt.c 2009-05-27 21:38:21.000000000 +0200
-@@ -2376,7 +2376,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2942,6 +2946,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.2/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.2/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 02784be..0000000
--- a/patches/gcc/4.4.2/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.0.orig/include/libiberty.h gcc-4.4.0/include/libiberty.h
---- gcc-4.4.0.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.0/include/libiberty.h 2009-05-27 21:38:24.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.2/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.2/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 06eafc5..0000000
--- a/patches/gcc/4.4.2/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
---- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-05-27 21:38:26.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.2/220-libiberty-pic.patch b/patches/gcc/4.4.2/220-libiberty-pic.patch
deleted file mode 100644
index ff13a4f..0000000
--- a/patches/gcc/4.4.2/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/libiberty/Makefile.in gcc-4.4.0/libiberty/Makefile.in
---- gcc-4.4.0.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.0/libiberty/Makefile.in 2009-05-27 21:38:29.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.2/230-superh-default-multilib.patch b/patches/gcc/4.4.2/230-superh-default-multilib.patch
deleted file mode 100644
index 7c719e8..0000000
--- a/patches/gcc/4.4.2/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:31.000000000 +0200
-@@ -2121,7 +2121,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.2/240-libstdc++-pic.patch b/patches/gcc/4.4.2/240-libstdc++-pic.patch
deleted file mode 100644
index b951dfc..0000000
--- a/patches/gcc/4.4.2/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.am 2009-05-27 21:38:34.000000000 +0200
-@@ -351,6 +351,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in 2009-01-17 03:03:25.000000000 +0100
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.in 2009-05-27 21:38:34.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -942,6 +942,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.2/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.2/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 9b80e6c..0000000
--- a/patches/gcc/4.4.2/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-05-27 21:38:37.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h 2009-05-27 21:38:37.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.2/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.2/260-sh-libgcc-stacks.patch
deleted file mode 100644
index 62af2c9..0000000
--- a/patches/gcc/4.4.2/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.0/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/lib1funcs.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.0/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/linux-atomic.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.2/270-sh-pr24836.patch b/patches/gcc/4.4.2/270-sh-pr24836.patch
deleted file mode 100644
index 3c745ab..0000000
--- a/patches/gcc/4.4.2/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:42.000000000 +0200
-@@ -22205,7 +22205,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:42.000000000 +0200
-@@ -2673,7 +2673,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.2/280-freebsd.patch b/patches/gcc/4.4.2/280-freebsd.patch
deleted file mode 100644
index 39d9d0b..0000000
--- a/patches/gcc/4.4.2/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:45.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
---- gcc-4.4.0.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-freebsd-eh 2009-05-27 21:38:45.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-05-27 21:38:34.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:45.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1042,6 +1042,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
---- gcc-4.4.0.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/crtstuff.c 2009-05-27 21:38:45.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c 2009-05-27 21:38:45.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.2/290-freebsd.patch b/patches/gcc/4.4.2/290-freebsd.patch
deleted file mode 100644
index ad1564b..0000000
--- a/patches/gcc/4.4.2/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.2/300-uclibc-conf.patch b/patches/gcc/4.4.2/300-uclibc-conf.patch
deleted file mode 100644
index e3f3b91..0000000
--- a/patches/gcc/4.4.2/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.0.orig/contrib/regression/objs-gcc.sh gcc-4.4.0/contrib/regression/objs-gcc.sh
---- gcc-4.4.0.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/contrib/regression/objs-gcc.sh 2009-05-27 21:38:53.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.0.orig/libjava/classpath/ltconfig gcc-4.4.0/libjava/classpath/ltconfig
---- gcc-4.4.0.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.0/libjava/classpath/ltconfig 2009-05-27 21:38:53.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.2/310-missing-execinfo_h.patch b/patches/gcc/4.4.2/310-missing-execinfo_h.patch
deleted file mode 100644
index 009335e..0000000
--- a/patches/gcc/4.4.2/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/boehm-gc/include/gc.h gcc-4.4.0/boehm-gc/include/gc.h
---- gcc-4.4.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.0/boehm-gc/include/gc.h 2009-05-27 21:38:55.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.2/320-c99-snprintf.patch b/patches/gcc/4.4.2/320-c99-snprintf.patch
deleted file mode 100644
index 4928f4b..0000000
--- a/patches/gcc/4.4.2/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.0/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/include/c_global/cstdio 2009-05-27 21:38:58.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.2/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.2/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index f3a4e32..0000000
--- a/patches/gcc/4.4.2/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
---- gcc-4.4.0.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libmudflap/mf-hooks2.c 2009-05-27 21:39:00.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.2/340-ecjx-host-cc.patch b/patches/gcc/4.4.2/340-ecjx-host-cc.patch
deleted file mode 100644
index eaf8ed4..0000000
--- a/patches/gcc/4.4.2/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur gcc-4.4.1-orig/libjava/Makefile.in gcc-4.4.1/libjava/Makefile.in
---- gcc-4.4.1-orig/libjava/Makefile.in 2009-08-04 04:12:27.000000000 -0700
-+++ gcc-4.4.1/libjava/Makefile.in 2009-09-23 22:03:15.750951483 -0700
-@@ -8874,6 +8874,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.2/350-index_macro.patch b/patches/gcc/4.4.2/350-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.4.2/350-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.2/360-arm-bigendian.patch b/patches/gcc/4.4.2/360-arm-bigendian.patch
deleted file mode 100644
index f0f10aa..0000000
--- a/patches/gcc/4.4.2/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.4.2.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.2/gcc/config/arm/linux-elf.h 2009-12-31 14:19:20.000000000 +0100
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -ru gcc-4.4.2.orig/gcc/config.gcc gcc-4.4.2/gcc/config.gcc
---- gcc-4.4.2.orig/gcc/config.gcc 2009-12-31 14:43:17.000000000 +0100
-+++ gcc-4.4.2/gcc/config.gcc 2010-01-05 09:27:42.000000000 +0100
-@@ -733,6 +733,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
-
diff --git a/patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 7a71d2d..0000000
--- a/patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff --git a/Makefile.in b/Makefile.in
-index e5fa1d3..dbfc1f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 15102e5..452d47c 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.2/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.2/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index 63d9121..0000000
--- a/patches/gcc/4.4.2/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -rdup gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver gcc-4.4.0/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver 2005-10-31 18:03:08.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-slibgcc-elf-ver 2008-10-07 19:28:13.000000000 +0200
-@@ -9,7 +9,7 @@ SHLIB_MAP = @shlib_map_file@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
-
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- -Wl,--soname=$(SHLIB_SONAME) \
-diff -rdup gcc-4.4.0.old/libgcc/configure gcc-4.4.0/libgcc/configure
---- gcc-4.4.0.old/libgcc/configure 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure 2008-10-07 19:40:48.000000000 +0200
-@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3522,6 +3522,39 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4242,6 +4275,7 @@ s,@enable_decimal_float@,$enable_decimal
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -rdup gcc-4.4.0.old/libgcc/configure.ac gcc-4.4.0/libgcc/configure.ac
---- gcc-4.4.0.old/libgcc/configure.ac 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure.ac 2008-10-07 19:34:48.000000000 +0200
-@@ -203,6 +203,27 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -rdup gcc-4.4.0.old/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.old/libgcc/Makefile.in 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2008-10-07 19:28:13.000000000 +0200
-@@ -40,6 +40,7 @@ enable_shared = @enable_shared@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -786,9 +787,10 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.2/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.2/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.2/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.2/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.2/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.2/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.2/410-libgcc_eh.a.patch b/patches/gcc/4.4.2/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.2/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.3/100-alpha-mieee-default.patch b/patches/gcc/4.4.3/100-alpha-mieee-default.patch
deleted file mode 100644
index 7cf0dc4..0000000
--- a/patches/gcc/4.4.3/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.h gcc-4.4.0/gcc/config/alpha/alpha.h
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.0/gcc/config/alpha/alpha.h 2009-05-27 21:37:58.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.0.orig/gcc/config/alpha/alpha.opt gcc-4.4.0/gcc/config/alpha/alpha.opt
---- gcc-4.4.0.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/alpha/alpha.opt 2009-05-27 21:37:58.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.3/110-trampolinewarn.patch b/patches/gcc/4.4.3/110-trampolinewarn.patch
deleted file mode 100644
index f3ef499..0000000
--- a/patches/gcc/4.4.3/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/builtins.c gcc-4.4.0/gcc/builtins.c
---- gcc-4.4.0.orig/gcc/builtins.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/builtins.c 2009-05-27 21:38:01.000000000 +0200
-@@ -5768,6 +5768,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.0.orig/gcc/common.opt gcc-4.4.0/gcc/common.opt
---- gcc-4.4.0.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.0/gcc/common.opt 2009-05-27 21:38:01.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.3/120-java-nomulti.patch b/patches/gcc/4.4.3/120-java-nomulti.patch
deleted file mode 100644
index 645479c..0000000
--- a/patches/gcc/4.4.3/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libjava/configure 2009-05-27 21:38:03.000000000 +0200
-@@ -1021,6 +1021,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1973,6 +1975,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac 2009-04-09 23:54:28.000000000 +0200
-+++ gcc-4.4.0/libjava/configure.ac 2009-05-27 21:38:03.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.3/130-cross-compile.patch b/patches/gcc/4.4.3/130-cross-compile.patch
deleted file mode 100644
index 76fe7c8..0000000
--- a/patches/gcc/4.4.3/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:06.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-03-24 18:46:03.000000000 +0100
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:06.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
---- gcc-4.4.0.orig/gcc/unwind-dw2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2.c 2009-05-27 21:38:06.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.3/140-default-format-security.patch b/patches/gcc/4.4.3/140-default-format-security.patch
deleted file mode 100644
index 51942f5..0000000
--- a/patches/gcc/4.4.3/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/c-common.c gcc-4.4.0/gcc/c-common.c
---- gcc-4.4.0.orig/gcc/c-common.c 2009-03-30 19:42:27.000000000 +0200
-+++ gcc-4.4.0/gcc/c-common.c 2009-05-27 21:38:08.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.0.orig/gcc/c.opt gcc-4.4.0/gcc/c.opt
---- gcc-4.4.0.orig/gcc/c.opt 2009-03-18 22:14:53.000000000 +0100
-+++ gcc-4.4.0/gcc/c.opt 2009-05-27 21:38:08.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:08.000000000 +0200
-@@ -2867,6 +2867,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2920,6 +2923,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.3/150-default-fortify-source.patch b/patches/gcc/4.4.3/150-default-fortify-source.patch
deleted file mode 100644
index a68227f..0000000
--- a/patches/gcc/4.4.3/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/doc/invoke.texi gcc-4.4.0/gcc/doc/invoke.texi
---- gcc-4.4.0.orig/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-+++ gcc-4.4.0/gcc/doc/invoke.texi 2009-05-27 21:38:11.000000000 +0200
-@@ -5411,6 +5411,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.0.orig/gcc/gcc.c gcc-4.4.0/gcc/gcc.c
---- gcc-4.4.0.orig/gcc/gcc.c 2009-03-17 22:25:59.000000000 +0100
-+++ gcc-4.4.0/gcc/gcc.c 2009-05-27 21:38:11.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.3/160-netbsd-symbolic.patch b/patches/gcc/4.4.3/160-netbsd-symbolic.patch
deleted file mode 100644
index fe1f1cb..0000000
--- a/patches/gcc/4.4.3/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/netbsd-elf.h gcc-4.4.0/gcc/config/netbsd-elf.h
---- gcc-4.4.0.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.0/gcc/config/netbsd-elf.h 2009-05-27 21:38:14.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.3/170-sparc64-bsd.patch b/patches/gcc/4.4.3/170-sparc64-bsd.patch
deleted file mode 100644
index 99a5eea..0000000
--- a/patches/gcc/4.4.3/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sparc/freebsd.h gcc-4.4.0/gcc/config/sparc/freebsd.h
---- gcc-4.4.0.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sparc/freebsd.h 2009-05-27 21:38:16.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.3/180-libgomp-no-werror.patch b/patches/gcc/4.4.3/180-libgomp-no-werror.patch
deleted file mode 100644
index 9d2adf0..0000000
--- a/patches/gcc/4.4.3/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
---- gcc-4.4.0.orig/libgomp/configure 2009-04-21 11:08:08.000000000 +0200
-+++ gcc-4.4.0/libgomp/configure 2009-05-27 21:38:19.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.3/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.3/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8db1ccc..0000000
--- a/patches/gcc/4.4.3/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
---- gcc-4.4.0.orig/gcc/stmt.c 2009-02-27 20:49:42.000000000 +0100
-+++ gcc-4.4.0/gcc/stmt.c 2009-05-27 21:38:21.000000000 +0200
-@@ -2376,7 +2376,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2942,6 +2946,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.3/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.3/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 02784be..0000000
--- a/patches/gcc/4.4.3/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.0.orig/include/libiberty.h gcc-4.4.0/include/libiberty.h
---- gcc-4.4.0.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.0/include/libiberty.h 2009-05-27 21:38:24.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.3/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.3/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 06eafc5..0000000
--- a/patches/gcc/4.4.3/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
---- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-05-27 21:38:26.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.3/220-libiberty-pic.patch b/patches/gcc/4.4.3/220-libiberty-pic.patch
deleted file mode 100644
index ff13a4f..0000000
--- a/patches/gcc/4.4.3/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.0.orig/libiberty/Makefile.in gcc-4.4.0/libiberty/Makefile.in
---- gcc-4.4.0.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.0/libiberty/Makefile.in 2009-05-27 21:38:29.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.3/230-superh-default-multilib.patch b/patches/gcc/4.4.3/230-superh-default-multilib.patch
deleted file mode 100644
index 7c719e8..0000000
--- a/patches/gcc/4.4.3/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:31.000000000 +0200
-@@ -2121,7 +2121,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.3/240-libstdc++-pic.patch b/patches/gcc/4.4.3/240-libstdc++-pic.patch
deleted file mode 100644
index b951dfc..0000000
--- a/patches/gcc/4.4.3/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am gcc-4.4.0/libstdc++-v3/src/Makefile.am
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.am 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.am 2009-05-27 21:38:34.000000000 +0200
-@@ -351,6 +351,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in gcc-4.4.0/libstdc++-v3/src/Makefile.in
---- gcc-4.4.0.orig/libstdc++-v3/src/Makefile.in 2009-01-17 03:03:25.000000000 +0100
-+++ gcc-4.4.0/libstdc++-v3/src/Makefile.in 2009-05-27 21:38:34.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -942,6 +942,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.3/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.3/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 9b80e6c..0000000
--- a/patches/gcc/4.4.3/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm 2009-05-27 21:38:37.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-05-27 21:38:37.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h 2009-05-27 21:38:37.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.3/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.3/260-sh-libgcc-stacks.patch
deleted file mode 100644
index 62af2c9..0000000
--- a/patches/gcc/4.4.3/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.0/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/lib1funcs.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.0/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.0.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/sh/linux-atomic.asm 2009-05-27 21:38:39.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.3/270-sh-pr24836.patch b/patches/gcc/4.4.3/270-sh-pr24836.patch
deleted file mode 100644
index 3c745ab..0000000
--- a/patches/gcc/4.4.3/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
---- gcc-4.4.0.orig/gcc/configure 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure 2009-05-27 21:38:42.000000000 +0200
-@@ -22205,7 +22205,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
---- gcc-4.4.0.orig/gcc/configure.ac 2009-05-27 21:38:08.000000000 +0200
-+++ gcc-4.4.0/gcc/configure.ac 2009-05-27 21:38:42.000000000 +0200
-@@ -2673,7 +2673,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.3/280-freebsd.patch b/patches/gcc/4.4.3/280-freebsd.patch
deleted file mode 100644
index 39d9d0b..0000000
--- a/patches/gcc/4.4.3/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:45.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
---- gcc-4.4.0.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-freebsd-eh 2009-05-27 21:38:45.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
---- gcc-4.4.0.orig/gcc/config.gcc 2009-05-27 21:38:34.000000000 +0200
-+++ gcc-4.4.0/gcc/config.gcc 2009-05-27 21:38:45.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1042,6 +1042,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
---- gcc-4.4.0.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/crtstuff.c 2009-05-27 21:38:45.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c 2009-05-27 21:38:45.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.3/290-freebsd.patch b/patches/gcc/4.4.3/290-freebsd.patch
deleted file mode 100644
index ad1564b..0000000
--- a/patches/gcc/4.4.3/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
---- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-+++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-05-27 21:38:47.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.3/300-uclibc-conf.patch b/patches/gcc/4.4.3/300-uclibc-conf.patch
deleted file mode 100644
index e3f3b91..0000000
--- a/patches/gcc/4.4.3/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.0.orig/contrib/regression/objs-gcc.sh gcc-4.4.0/contrib/regression/objs-gcc.sh
---- gcc-4.4.0.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/contrib/regression/objs-gcc.sh 2009-05-27 21:38:53.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.0.orig/libjava/classpath/ltconfig gcc-4.4.0/libjava/classpath/ltconfig
---- gcc-4.4.0.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.0/libjava/classpath/ltconfig 2009-05-27 21:38:53.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.3/310-missing-execinfo_h.patch b/patches/gcc/4.4.3/310-missing-execinfo_h.patch
deleted file mode 100644
index 009335e..0000000
--- a/patches/gcc/4.4.3/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/boehm-gc/include/gc.h gcc-4.4.0/boehm-gc/include/gc.h
---- gcc-4.4.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.0/boehm-gc/include/gc.h 2009-05-27 21:38:55.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.3/320-c99-snprintf.patch b/patches/gcc/4.4.3/320-c99-snprintf.patch
deleted file mode 100644
index 4928f4b..0000000
--- a/patches/gcc/4.4.3/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.0/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.0.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libstdc++-v3/include/c_global/cstdio 2009-05-27 21:38:58.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.3/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.3/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index f3a4e32..0000000
--- a/patches/gcc/4.4.3/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.0.orig/libmudflap/mf-hooks2.c gcc-4.4.0/libmudflap/mf-hooks2.c
---- gcc-4.4.0.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libmudflap/mf-hooks2.c 2009-05-27 21:39:00.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.3/340-ecjx-host-cc.patch b/patches/gcc/4.4.3/340-ecjx-host-cc.patch
deleted file mode 100644
index eaf8ed4..0000000
--- a/patches/gcc/4.4.3/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur gcc-4.4.1-orig/libjava/Makefile.in gcc-4.4.1/libjava/Makefile.in
---- gcc-4.4.1-orig/libjava/Makefile.in 2009-08-04 04:12:27.000000000 -0700
-+++ gcc-4.4.1/libjava/Makefile.in 2009-09-23 22:03:15.750951483 -0700
-@@ -8874,6 +8874,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.3/350-index_macro.patch b/patches/gcc/4.4.3/350-index_macro.patch
deleted file mode 100644
index 7bb899a..0000000
--- a/patches/gcc/4.4.3/350-index_macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Original patch from: ../4.3.2/290-index_macro.patch
-
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
-@@ -59,6 +59,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
-+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.3/360-arm-bigendian.patch b/patches/gcc/4.4.3/360-arm-bigendian.patch
deleted file mode 100644
index f0f10aa..0000000
--- a/patches/gcc/4.4.3/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.4.2.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.2/gcc/config/arm/linux-elf.h 2009-12-31 14:19:20.000000000 +0100
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -ru gcc-4.4.2.orig/gcc/config.gcc gcc-4.4.2/gcc/config.gcc
---- gcc-4.4.2.orig/gcc/config.gcc 2009-12-31 14:43:17.000000000 +0100
-+++ gcc-4.4.2/gcc/config.gcc 2010-01-05 09:27:42.000000000 +0100
-@@ -733,6 +733,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
-
diff --git a/patches/gcc/4.4.3/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.3/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 7a71d2d..0000000
--- a/patches/gcc/4.4.3/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff --git a/Makefile.in b/Makefile.in
-index e5fa1d3..dbfc1f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 15102e5..452d47c 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.3/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.3/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index c12f967..0000000
--- a/patches/gcc/4.4.3/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -rdup gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver gcc-4.4.0/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver 2005-10-31 18:03:08.000000000 +0100
-+++ gcc-4.4.0/gcc/config/t-slibgcc-elf-ver 2008-10-07 19:28:13.000000000 +0200
-@@ -9,7 +9,7 @@ SHLIB_MAP = @shlib_map_file@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
- SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
- SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-diff -rdup gcc-4.4.0.old/libgcc/configure gcc-4.4.0/libgcc/configure
---- gcc-4.4.0.old/libgcc/configure 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure 2008-10-07 19:40:48.000000000 +0200
-@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3522,6 +3522,39 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4242,6 +4275,7 @@ s,@enable_decimal_float@,$enable_decimal
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -rdup gcc-4.4.0.old/libgcc/configure.ac gcc-4.4.0/libgcc/configure.ac
---- gcc-4.4.0.old/libgcc/configure.ac 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/configure.ac 2008-10-07 19:34:48.000000000 +0200
-@@ -203,6 +203,27 @@ if test "$enable_tls $gcc_cv_have_cc_tls
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -rdup gcc-4.4.0.old/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.old/libgcc/Makefile.in 2008-07-17 10:40:53.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2008-10-07 19:28:13.000000000 +0200
-@@ -40,6 +40,7 @@ enable_shared = @enable_shared@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -786,9 +787,10 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.3/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.3/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.3/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.3/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.3/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.3/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.3/410-libgcc_eh.a.patch b/patches/gcc/4.4.3/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.3/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.4/100-alpha-mieee-default.patch b/patches/gcc/4.4.4/100-alpha-mieee-default.patch
deleted file mode 100644
index a5759cf..0000000
--- a/patches/gcc/4.4.4/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/alpha/alpha.h gcc-4.4.4/gcc/config/alpha/alpha.h
---- gcc-4.4.4.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.4/gcc/config/alpha/alpha.h 2010-05-16 19:10:19.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.4.orig/gcc/config/alpha/alpha.opt gcc-4.4.4/gcc/config/alpha/alpha.opt
---- gcc-4.4.4.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.4/gcc/config/alpha/alpha.opt 2010-05-16 19:10:19.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.4/110-trampolinewarn.patch b/patches/gcc/4.4.4/110-trampolinewarn.patch
deleted file mode 100644
index 3b221d9..0000000
--- a/patches/gcc/4.4.4/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/builtins.c gcc-4.4.4/gcc/builtins.c
---- gcc-4.4.4.orig/gcc/builtins.c 2010-03-22 16:00:20.000000000 +0100
-+++ gcc-4.4.4/gcc/builtins.c 2010-05-16 19:10:34.000000000 +0200
-@@ -5783,6 +5783,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.4.orig/gcc/common.opt gcc-4.4.4/gcc/common.opt
---- gcc-4.4.4.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.4/gcc/common.opt 2010-05-16 19:10:34.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.4/120-java-nomulti.patch b/patches/gcc/4.4.4/120-java-nomulti.patch
deleted file mode 100644
index 4430637..0000000
--- a/patches/gcc/4.4.4/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure
---- gcc-4.4.4.orig/libjava/configure 2010-04-29 10:26:54.000000000 +0200
-+++ gcc-4.4.4/libjava/configure 2010-05-16 19:10:49.000000000 +0200
-@@ -1021,6 +1021,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1973,6 +1975,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac
---- gcc-4.4.4.orig/libjava/configure.ac 2010-04-21 19:04:42.000000000 +0200
-+++ gcc-4.4.4/libjava/configure.ac 2010-05-16 19:10:49.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.4/130-cross-compile.patch b/patches/gcc/4.4.4/130-cross-compile.patch
deleted file mode 100644
index 1899716..0000000
--- a/patches/gcc/4.4.4/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/configure gcc-4.4.4/gcc/configure
---- gcc-4.4.4.orig/gcc/configure 2009-10-19 14:15:27.000000000 +0200
-+++ gcc-4.4.4/gcc/configure 2010-05-16 19:11:00.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.4.orig/gcc/configure.ac gcc-4.4.4/gcc/configure.ac
---- gcc-4.4.4.orig/gcc/configure.ac 2009-10-19 14:15:27.000000000 +0200
-+++ gcc-4.4.4/gcc/configure.ac 2010-05-16 19:11:00.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.4.orig/gcc/unwind-dw2.c gcc-4.4.4/gcc/unwind-dw2.c
---- gcc-4.4.4.orig/gcc/unwind-dw2.c 2010-01-20 09:39:18.000000000 +0100
-+++ gcc-4.4.4/gcc/unwind-dw2.c 2010-05-16 19:11:00.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.4/140-default-format-security.patch b/patches/gcc/4.4.4/140-default-format-security.patch
deleted file mode 100644
index b94f520..0000000
--- a/patches/gcc/4.4.4/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/c-common.c gcc-4.4.4/gcc/c-common.c
---- gcc-4.4.4.orig/gcc/c-common.c 2009-11-05 15:57:57.000000000 +0100
-+++ gcc-4.4.4/gcc/c-common.c 2010-05-16 19:11:21.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.4.orig/gcc/c.opt gcc-4.4.4/gcc/c.opt
---- gcc-4.4.4.orig/gcc/c.opt 2009-09-18 23:53:23.000000000 +0200
-+++ gcc-4.4.4/gcc/c.opt 2010-05-16 19:11:21.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.4.orig/gcc/doc/invoke.texi gcc-4.4.4/gcc/doc/invoke.texi
---- gcc-4.4.4.orig/gcc/doc/invoke.texi 2010-04-08 12:46:46.000000000 +0200
-+++ gcc-4.4.4/gcc/doc/invoke.texi 2010-05-16 19:11:21.000000000 +0200
-@@ -2888,6 +2888,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2941,6 +2944,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.4/150-default-fortify-source.patch b/patches/gcc/4.4.4/150-default-fortify-source.patch
deleted file mode 100644
index e39ca10..0000000
--- a/patches/gcc/4.4.4/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/doc/invoke.texi gcc-4.4.4/gcc/doc/invoke.texi
---- gcc-4.4.4.orig/gcc/doc/invoke.texi 2010-05-16 19:11:21.000000000 +0200
-+++ gcc-4.4.4/gcc/doc/invoke.texi 2010-05-16 19:11:30.000000000 +0200
-@@ -5432,6 +5432,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.4.orig/gcc/gcc.c gcc-4.4.4/gcc/gcc.c
---- gcc-4.4.4.orig/gcc/gcc.c 2010-01-09 01:05:06.000000000 +0100
-+++ gcc-4.4.4/gcc/gcc.c 2010-05-16 19:11:30.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.4/160-netbsd-symbolic.patch b/patches/gcc/4.4.4/160-netbsd-symbolic.patch
deleted file mode 100644
index d6f3ce5..0000000
--- a/patches/gcc/4.4.4/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/netbsd-elf.h gcc-4.4.4/gcc/config/netbsd-elf.h
---- gcc-4.4.4.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.4/gcc/config/netbsd-elf.h 2010-05-16 19:11:50.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.4/170-sparc64-bsd.patch b/patches/gcc/4.4.4/170-sparc64-bsd.patch
deleted file mode 100644
index 089f51c..0000000
--- a/patches/gcc/4.4.4/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/sparc/freebsd.h gcc-4.4.4/gcc/config/sparc/freebsd.h
---- gcc-4.4.4.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.4/gcc/config/sparc/freebsd.h 2010-05-16 19:12:00.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.4/180-libgomp-no-werror.patch b/patches/gcc/4.4.4/180-libgomp-no-werror.patch
deleted file mode 100644
index 0afbf55..0000000
--- a/patches/gcc/4.4.4/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.4.orig/libgomp/configure gcc-4.4.4/libgomp/configure
---- gcc-4.4.4.orig/libgomp/configure 2010-04-29 10:26:54.000000000 +0200
-+++ gcc-4.4.4/libgomp/configure 2010-05-16 19:12:19.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.4/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.4/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index 03b8060..0000000
--- a/patches/gcc/4.4.4/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/stmt.c gcc-4.4.4/gcc/stmt.c
---- gcc-4.4.4.orig/gcc/stmt.c 2010-03-08 12:46:28.000000000 +0100
-+++ gcc-4.4.4/gcc/stmt.c 2010-05-16 19:12:31.000000000 +0200
-@@ -2377,7 +2377,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2943,6 +2947,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.4/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.4/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 7e4fe1f..0000000
--- a/patches/gcc/4.4.4/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.4.orig/include/libiberty.h gcc-4.4.4/include/libiberty.h
---- gcc-4.4.4.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.4/include/libiberty.h 2010-05-16 19:12:50.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.4/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.4/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 6f0b4ba..0000000
--- a/patches/gcc/4.4.4/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/arm/linux-eabi.h gcc-4.4.4/gcc/config/arm/linux-eabi.h
---- gcc-4.4.4.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.4/gcc/config/arm/linux-eabi.h 2010-05-16 19:13:00.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.4/220-libiberty-pic.patch b/patches/gcc/4.4.4/220-libiberty-pic.patch
deleted file mode 100644
index 6a291bb..0000000
--- a/patches/gcc/4.4.4/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.4.orig/libiberty/Makefile.in gcc-4.4.4/libiberty/Makefile.in
---- gcc-4.4.4.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.4/libiberty/Makefile.in 2010-05-16 19:13:20.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.4/230-superh-default-multilib.patch b/patches/gcc/4.4.4/230-superh-default-multilib.patch
deleted file mode 100644
index 2631c77..0000000
--- a/patches/gcc/4.4.4/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config.gcc gcc-4.4.4/gcc/config.gcc
---- gcc-4.4.4.orig/gcc/config.gcc 2010-02-18 05:24:04.000000000 +0100
-+++ gcc-4.4.4/gcc/config.gcc 2010-05-16 19:13:30.000000000 +0200
-@@ -2128,7 +2128,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.4/240-libstdc++-pic.patch b/patches/gcc/4.4.4/240-libstdc++-pic.patch
deleted file mode 100644
index 756d620..0000000
--- a/patches/gcc/4.4.4/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.4.orig/libstdc++-v3/src/Makefile.am gcc-4.4.4/libstdc++-v3/src/Makefile.am
---- gcc-4.4.4.orig/libstdc++-v3/src/Makefile.am 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.4/libstdc++-v3/src/Makefile.am 2010-05-16 19:13:50.000000000 +0200
-@@ -356,6 +356,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.4.orig/libstdc++-v3/src/Makefile.in gcc-4.4.4/libstdc++-v3/src/Makefile.in
---- gcc-4.4.4.orig/libstdc++-v3/src/Makefile.in 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.4/libstdc++-v3/src/Makefile.in 2010-05-16 19:13:50.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -947,6 +947,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.4/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.4/250-ia64-noteGNUstack.patch
deleted file mode 100644
index ce1bfe6..0000000
--- a/patches/gcc/4.4.4/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.4/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.4.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/ia64/crtbegin.asm 2010-05-16 19:13:59.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/crtend.asm gcc-4.4.4/gcc/config/ia64/crtend.asm
---- gcc-4.4.4.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/ia64/crtend.asm 2010-05-16 19:13:59.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/crti.asm gcc-4.4.4/gcc/config/ia64/crti.asm
---- gcc-4.4.4.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/ia64/crti.asm 2010-05-16 19:13:59.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/crtn.asm gcc-4.4.4/gcc/config/ia64/crtn.asm
---- gcc-4.4.4.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/ia64/crtn.asm 2010-05-16 19:13:59.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.4/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.4.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/ia64/lib1funcs.asm 2010-05-16 19:13:59.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.4.orig/gcc/config/ia64/linux.h gcc-4.4.4/gcc/config/ia64/linux.h
---- gcc-4.4.4.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.4/gcc/config/ia64/linux.h 2010-05-16 19:13:59.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.4.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.4/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.4.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.4/gcc/config/rs6000/ppc-asm.h 2010-05-16 19:13:59.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.4/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.4/260-sh-libgcc-stacks.patch
deleted file mode 100644
index 1326b1c..0000000
--- a/patches/gcc/4.4.4/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.4/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.4.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/sh/lib1funcs.asm 2010-05-16 19:14:19.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.4.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.4/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.4.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/sh/linux-atomic.asm 2010-05-16 19:14:19.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.4/270-sh-pr24836.patch b/patches/gcc/4.4.4/270-sh-pr24836.patch
deleted file mode 100644
index 1537721..0000000
--- a/patches/gcc/4.4.4/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/configure gcc-4.4.4/gcc/configure
---- gcc-4.4.4.orig/gcc/configure 2010-05-16 19:11:00.000000000 +0200
-+++ gcc-4.4.4/gcc/configure 2010-05-16 19:14:31.000000000 +0200
-@@ -22241,7 +22241,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.4.orig/gcc/configure.ac gcc-4.4.4/gcc/configure.ac
---- gcc-4.4.4.orig/gcc/configure.ac 2010-05-16 19:11:00.000000000 +0200
-+++ gcc-4.4.4/gcc/configure.ac 2010-05-16 19:14:31.000000000 +0200
-@@ -2684,7 +2684,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.4/280-freebsd.patch b/patches/gcc/4.4.4/280-freebsd.patch
deleted file mode 100644
index ea7f63b..0000000
--- a/patches/gcc/4.4.4/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/freebsd-spec.h gcc-4.4.4/gcc/config/freebsd-spec.h
---- gcc-4.4.4.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/config/freebsd-spec.h 2010-05-16 19:36:15.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.4.orig/gcc/config/t-freebsd-eh gcc-4.4.4/gcc/config/t-freebsd-eh
---- gcc-4.4.4.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.4/gcc/config/t-freebsd-eh 2010-05-16 19:36:15.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.4.orig/gcc/config.gcc gcc-4.4.4/gcc/config.gcc
---- gcc-4.4.4.orig/gcc/config.gcc 2010-05-16 19:13:30.000000000 +0200
-+++ gcc-4.4.4/gcc/config.gcc 2010-05-16 19:36:15.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1042,6 +1042,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.4.orig/gcc/crtstuff.c gcc-4.4.4/gcc/crtstuff.c
---- gcc-4.4.4.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/crtstuff.c 2010-05-16 19:36:15.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.4.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.4/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.4.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/gcc/unwind-dw2-fde-glibc.c 2010-05-16 19:36:15.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.4/290-freebsd.patch b/patches/gcc/4.4.4/290-freebsd.patch
deleted file mode 100644
index 94fa03b..0000000
--- a/patches/gcc/4.4.4/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.4.orig/gcc/config/freebsd-spec.h gcc-4.4.4/gcc/config/freebsd-spec.h
---- gcc-4.4.4.orig/gcc/config/freebsd-spec.h 2010-05-16 19:36:15.000000000 +0200
-+++ gcc-4.4.4/gcc/config/freebsd-spec.h 2010-05-16 19:36:21.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.4/300-uclibc-conf.patch b/patches/gcc/4.4.4/300-uclibc-conf.patch
deleted file mode 100644
index 9418fa9..0000000
--- a/patches/gcc/4.4.4/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.4.orig/contrib/regression/objs-gcc.sh gcc-4.4.4/contrib/regression/objs-gcc.sh
---- gcc-4.4.4.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/contrib/regression/objs-gcc.sh 2010-05-16 19:36:36.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.4.orig/libjava/classpath/ltconfig gcc-4.4.4/libjava/classpath/ltconfig
---- gcc-4.4.4.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.4/libjava/classpath/ltconfig 2010-05-16 19:36:36.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.4/310-missing-execinfo_h.patch b/patches/gcc/4.4.4/310-missing-execinfo_h.patch
deleted file mode 100644
index de5cab4..0000000
--- a/patches/gcc/4.4.4/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.4.orig/boehm-gc/include/gc.h gcc-4.4.4/boehm-gc/include/gc.h
---- gcc-4.4.4.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.4/boehm-gc/include/gc.h 2010-05-16 19:36:48.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.4/320-c99-snprintf.patch b/patches/gcc/4.4.4/320-c99-snprintf.patch
deleted file mode 100644
index 9331564..0000000
--- a/patches/gcc/4.4.4/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.4.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.4/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.4.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/libstdc++-v3/include/c_global/cstdio 2010-05-16 19:37:06.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.4/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.4/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index e83e14e..0000000
--- a/patches/gcc/4.4.4/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.4.orig/libmudflap/mf-hooks2.c gcc-4.4.4/libmudflap/mf-hooks2.c
---- gcc-4.4.4.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/libmudflap/mf-hooks2.c 2010-05-16 19:37:18.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.4/340-ecjx-host-cc.patch b/patches/gcc/4.4.4/340-ecjx-host-cc.patch
deleted file mode 100644
index e614eb5..0000000
--- a/patches/gcc/4.4.4/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.4.4.orig/libjava/Makefile.in gcc-4.4.4/libjava/Makefile.in
---- gcc-4.4.4.orig/libjava/Makefile.in 2010-04-29 10:26:54.000000000 +0200
-+++ gcc-4.4.4/libjava/Makefile.in 2010-05-16 19:37:38.000000000 +0200
-@@ -9270,6 +9270,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.4/350-index_macro.patch b/patches/gcc/4.4.4/350-index_macro.patch
deleted file mode 100644
index 29c3c91..0000000
--- a/patches/gcc/4.4.4/350-index_macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/rope gcc-4.4.4/libstdc++-v3/include/ext/rope
---- gcc-4.4.4.orig/libstdc++-v3/include/ext/rope 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/libstdc++-v3/include/ext/rope 2010-05-16 19:37:47.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h 2010-05-16 19:37:47.000000000 +0200
-@@ -49,6 +49,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.4/360-arm-bigendian.patch b/patches/gcc/4.4.4/360-arm-bigendian.patch
deleted file mode 100644
index b422391..0000000
--- a/patches/gcc/4.4.4/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-diff -durN gcc-4.4.4.orig/gcc/config/arm/linux-elf.h gcc-4.4.4/gcc/config/arm/linux-elf.h
---- gcc-4.4.4.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.4/gcc/config/arm/linux-elf.h 2010-05-16 19:38:07.000000000 +0200
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -durN gcc-4.4.4.orig/gcc/config.gcc gcc-4.4.4/gcc/config.gcc
---- gcc-4.4.4.orig/gcc/config.gcc 2010-05-16 19:36:15.000000000 +0200
-+++ gcc-4.4.4/gcc/config.gcc 2010-05-16 19:38:07.000000000 +0200
-@@ -733,6 +733,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
diff --git a/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 2317e66..0000000
--- a/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff -durN gcc-4.4.4.orig/Makefile.in gcc-4.4.4/Makefile.in
---- gcc-4.4.4.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200
-+++ gcc-4.4.4/Makefile.in 2010-05-16 19:38:17.000000000 +0200
-@@ -245,7 +245,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff -durN gcc-4.4.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl
---- gcc-4.4.4.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200
-+++ gcc-4.4.4/Makefile.tpl 2010-05-16 19:38:17.000000000 +0200
-@@ -248,7 +248,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index a47a308..0000000
--- a/patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -durN gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.4/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver 2010-01-04 16:13:08.000000000 +0100
-+++ gcc-4.4.4/gcc/config/t-slibgcc-elf-ver 2010-05-16 19:38:36.000000000 +0200
-@@ -9,7 +9,7 @@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
- SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
- SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-diff -durN gcc-4.4.4.orig/libgcc/Makefile.in gcc-4.4.4/libgcc/Makefile.in
---- gcc-4.4.4.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.4/libgcc/Makefile.in 2010-05-16 19:38:36.000000000 +0200
-@@ -39,6 +39,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -787,9 +788,10 @@
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
-diff -durN gcc-4.4.4.orig/libgcc/configure gcc-4.4.4/libgcc/configure
---- gcc-4.4.4.orig/libgcc/configure 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.4/libgcc/configure 2010-05-16 19:38:36.000000000 +0200
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3547,6 +3547,39 @@
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4267,6 +4300,7 @@
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -durN gcc-4.4.4.orig/libgcc/configure.ac gcc-4.4.4/libgcc/configure.ac
---- gcc-4.4.4.orig/libgcc/configure.ac 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.4/libgcc/configure.ac 2010-05-16 19:38:36.000000000 +0200
-@@ -223,6 +223,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
diff --git a/patches/gcc/4.4.4/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.4/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.4/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.4/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.4/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.4/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.4/410-libgcc_eh.a.patch b/patches/gcc/4.4.4/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.4/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.5/100-alpha-mieee-default.patch b/patches/gcc/4.4.5/100-alpha-mieee-default.patch
deleted file mode 100644
index 5f3acd8..0000000
--- a/patches/gcc/4.4.5/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/alpha/alpha.h gcc-4.4.5/gcc/config/alpha/alpha.h
---- gcc-4.4.5.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.5/gcc/config/alpha/alpha.h 2010-10-09 22:57:31.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.5.orig/gcc/config/alpha/alpha.opt gcc-4.4.5/gcc/config/alpha/alpha.opt
---- gcc-4.4.5.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/alpha/alpha.opt 2010-10-09 22:57:31.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.5/110-trampolinewarn.patch b/patches/gcc/4.4.5/110-trampolinewarn.patch
deleted file mode 100644
index 0bce857..0000000
--- a/patches/gcc/4.4.5/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/builtins.c gcc-4.4.5/gcc/builtins.c
---- gcc-4.4.5.orig/gcc/builtins.c 2010-03-22 16:00:20.000000000 +0100
-+++ gcc-4.4.5/gcc/builtins.c 2010-10-09 22:57:58.000000000 +0200
-@@ -5783,6 +5783,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.5.orig/gcc/common.opt gcc-4.4.5/gcc/common.opt
---- gcc-4.4.5.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.5/gcc/common.opt 2010-10-09 22:57:58.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.5/120-java-nomulti.patch b/patches/gcc/4.4.5/120-java-nomulti.patch
deleted file mode 100644
index aded63e..0000000
--- a/patches/gcc/4.4.5/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
---- gcc-4.4.5.orig/libjava/configure 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libjava/configure 2010-10-09 22:58:04.000000000 +0200
-@@ -1022,6 +1022,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1974,6 +1976,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
---- gcc-4.4.5.orig/libjava/configure.ac 2010-06-11 13:49:16.000000000 +0200
-+++ gcc-4.4.5/libjava/configure.ac 2010-10-09 22:58:04.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.5/130-cross-compile.patch b/patches/gcc/4.4.5/130-cross-compile.patch
deleted file mode 100644
index 72bc60e..0000000
--- a/patches/gcc/4.4.5/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/configure gcc-4.4.5/gcc/configure
---- gcc-4.4.5.orig/gcc/configure 2010-06-20 17:43:53.000000000 +0200
-+++ gcc-4.4.5/gcc/configure 2010-10-09 22:58:36.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.5.orig/gcc/configure.ac gcc-4.4.5/gcc/configure.ac
---- gcc-4.4.5.orig/gcc/configure.ac 2010-06-20 17:43:53.000000000 +0200
-+++ gcc-4.4.5/gcc/configure.ac 2010-10-09 22:58:36.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.5.orig/gcc/unwind-dw2.c gcc-4.4.5/gcc/unwind-dw2.c
---- gcc-4.4.5.orig/gcc/unwind-dw2.c 2010-01-20 09:39:18.000000000 +0100
-+++ gcc-4.4.5/gcc/unwind-dw2.c 2010-10-09 22:58:36.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.5/140-default-format-security.patch b/patches/gcc/4.4.5/140-default-format-security.patch
deleted file mode 100644
index ac1d988..0000000
--- a/patches/gcc/4.4.5/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/c-common.c gcc-4.4.5/gcc/c-common.c
---- gcc-4.4.5.orig/gcc/c-common.c 2010-07-27 15:07:28.000000000 +0200
-+++ gcc-4.4.5/gcc/c-common.c 2010-10-09 22:59:03.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.5.orig/gcc/c.opt gcc-4.4.5/gcc/c.opt
---- gcc-4.4.5.orig/gcc/c.opt 2009-09-18 23:53:23.000000000 +0200
-+++ gcc-4.4.5/gcc/c.opt 2010-10-09 22:59:03.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
---- gcc-4.4.5.orig/gcc/doc/invoke.texi 2010-09-08 20:13:03.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/invoke.texi 2010-10-09 22:59:03.000000000 +0200
-@@ -2888,6 +2888,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2941,6 +2944,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.5/150-default-fortify-source.patch b/patches/gcc/4.4.5/150-default-fortify-source.patch
deleted file mode 100644
index ad5a7e8..0000000
--- a/patches/gcc/4.4.5/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
---- gcc-4.4.5.orig/gcc/doc/invoke.texi 2010-10-09 22:59:03.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/invoke.texi 2010-10-09 22:59:33.000000000 +0200
-@@ -5432,6 +5432,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.5.orig/gcc/gcc.c gcc-4.4.5/gcc/gcc.c
---- gcc-4.4.5.orig/gcc/gcc.c 2010-01-09 01:05:06.000000000 +0100
-+++ gcc-4.4.5/gcc/gcc.c 2010-10-09 22:59:33.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.5/160-netbsd-symbolic.patch b/patches/gcc/4.4.5/160-netbsd-symbolic.patch
deleted file mode 100644
index a61b078..0000000
--- a/patches/gcc/4.4.5/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/netbsd-elf.h gcc-4.4.5/gcc/config/netbsd-elf.h
---- gcc-4.4.5.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.5/gcc/config/netbsd-elf.h 2010-10-09 22:59:57.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.5/170-sparc64-bsd.patch b/patches/gcc/4.4.5/170-sparc64-bsd.patch
deleted file mode 100644
index 85d9b52..0000000
--- a/patches/gcc/4.4.5/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/sparc/freebsd.h gcc-4.4.5/gcc/config/sparc/freebsd.h
---- gcc-4.4.5.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sparc/freebsd.h 2010-10-09 23:00:03.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.5/180-libgomp-no-werror.patch b/patches/gcc/4.4.5/180-libgomp-no-werror.patch
deleted file mode 100644
index 35d5063..0000000
--- a/patches/gcc/4.4.5/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/libgomp/configure gcc-4.4.5/libgomp/configure
---- gcc-4.4.5.orig/libgomp/configure 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libgomp/configure 2010-10-09 23:00:33.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.5/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.5/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index d4d68fe..0000000
--- a/patches/gcc/4.4.5/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/stmt.c gcc-4.4.5/gcc/stmt.c
---- gcc-4.4.5.orig/gcc/stmt.c 2010-03-08 12:46:28.000000000 +0100
-+++ gcc-4.4.5/gcc/stmt.c 2010-10-09 23:01:01.000000000 +0200
-@@ -2377,7 +2377,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2943,6 +2947,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.5/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.5/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 19e4523..0000000
--- a/patches/gcc/4.4.5/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.5.orig/include/libiberty.h gcc-4.4.5/include/libiberty.h
---- gcc-4.4.5.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.5/include/libiberty.h 2010-10-09 23:01:30.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.5/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.5/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 396a80b..0000000
--- a/patches/gcc/4.4.5/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/arm/linux-eabi.h gcc-4.4.5/gcc/config/arm/linux-eabi.h
---- gcc-4.4.5.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/linux-eabi.h 2010-10-09 23:01:59.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.5/220-libiberty-pic.patch b/patches/gcc/4.4.5/220-libiberty-pic.patch
deleted file mode 100644
index 93b180a..0000000
--- a/patches/gcc/4.4.5/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.5.orig/libiberty/Makefile.in gcc-4.4.5/libiberty/Makefile.in
---- gcc-4.4.5.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.5/libiberty/Makefile.in 2010-10-09 23:02:28.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.5/230-superh-default-multilib.patch b/patches/gcc/4.4.5/230-superh-default-multilib.patch
deleted file mode 100644
index 0df23a9..0000000
--- a/patches/gcc/4.4.5/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-06-14 00:16:50.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:02:56.000000000 +0200
-@@ -2140,7 +2140,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.5/240-libstdc++-pic.patch b/patches/gcc/4.4.5/240-libstdc++-pic.patch
deleted file mode 100644
index 4dde5a1..0000000
--- a/patches/gcc/4.4.5/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am gcc-4.4.5/libstdc++-v3/src/Makefile.am
---- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/src/Makefile.am 2010-10-09 23:03:26.000000000 +0200
-@@ -356,6 +356,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in gcc-4.4.5/libstdc++-v3/src/Makefile.in
---- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/src/Makefile.in 2010-10-09 23:03:26.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -947,6 +947,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.5/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.5/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 6d128e4..0000000
--- a/patches/gcc/4.4.5/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.5/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtbegin.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtend.asm gcc-4.4.5/gcc/config/ia64/crtend.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtend.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crti.asm gcc-4.4.5/gcc/config/ia64/crti.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crti.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtn.asm gcc-4.4.5/gcc/config/ia64/crtn.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtn.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.5/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.5.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/lib1funcs.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/linux.h gcc-4.4.5/gcc/config/ia64/linux.h
---- gcc-4.4.5.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.5/gcc/config/ia64/linux.h 2010-10-09 23:03:55.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.5.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.5/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.5.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.5/gcc/config/rs6000/ppc-asm.h 2010-10-09 23:03:55.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.5/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.5/260-sh-libgcc-stacks.patch
deleted file mode 100644
index cc6baf3..0000000
--- a/patches/gcc/4.4.5/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.5/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.5.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sh/lib1funcs.asm 2010-10-09 23:04:22.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.5/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sh/linux-atomic.asm 2010-10-09 23:04:22.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.5/270-sh-pr24836.patch b/patches/gcc/4.4.5/270-sh-pr24836.patch
deleted file mode 100644
index 11ca63d..0000000
--- a/patches/gcc/4.4.5/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/configure gcc-4.4.5/gcc/configure
---- gcc-4.4.5.orig/gcc/configure 2010-10-09 22:58:36.000000000 +0200
-+++ gcc-4.4.5/gcc/configure 2010-10-09 23:04:50.000000000 +0200
-@@ -22285,7 +22285,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.5.orig/gcc/configure.ac gcc-4.4.5/gcc/configure.ac
---- gcc-4.4.5.orig/gcc/configure.ac 2010-10-09 22:58:36.000000000 +0200
-+++ gcc-4.4.5/gcc/configure.ac 2010-10-09 23:04:50.000000000 +0200
-@@ -2728,7 +2728,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.5/280-freebsd.patch b/patches/gcc/4.4.5/280-freebsd.patch
deleted file mode 100644
index e26b34a..0000000
--- a/patches/gcc/4.4.5/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/freebsd-spec.h gcc-4.4.5/gcc/config/freebsd-spec.h
---- gcc-4.4.5.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/freebsd-spec.h 2010-10-09 23:09:53.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.5.orig/gcc/config/t-freebsd-eh gcc-4.4.5/gcc/config/t-freebsd-eh
---- gcc-4.4.5.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/t-freebsd-eh 2010-10-09 23:09:53.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-10-09 23:02:56.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:09:53.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1048,6 +1048,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.5.orig/gcc/crtstuff.c gcc-4.4.5/gcc/crtstuff.c
---- gcc-4.4.5.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/crtstuff.c 2010-10-09 23:09:53.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.5.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.5/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.5.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/unwind-dw2-fde-glibc.c 2010-10-09 23:09:53.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.5/290-freebsd.patch b/patches/gcc/4.4.5/290-freebsd.patch
deleted file mode 100644
index 88d632e..0000000
--- a/patches/gcc/4.4.5/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/freebsd-spec.h gcc-4.4.5/gcc/config/freebsd-spec.h
---- gcc-4.4.5.orig/gcc/config/freebsd-spec.h 2010-10-09 23:09:53.000000000 +0200
-+++ gcc-4.4.5/gcc/config/freebsd-spec.h 2010-10-09 23:10:02.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.5/300-uclibc-conf.patch b/patches/gcc/4.4.5/300-uclibc-conf.patch
deleted file mode 100644
index b1465e0..0000000
--- a/patches/gcc/4.4.5/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.5.orig/contrib/regression/objs-gcc.sh gcc-4.4.5/contrib/regression/objs-gcc.sh
---- gcc-4.4.5.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/contrib/regression/objs-gcc.sh 2010-10-09 23:10:32.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.5.orig/libjava/classpath/ltconfig gcc-4.4.5/libjava/classpath/ltconfig
---- gcc-4.4.5.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.5/libjava/classpath/ltconfig 2010-10-09 23:10:32.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.5/310-missing-execinfo_h.patch b/patches/gcc/4.4.5/310-missing-execinfo_h.patch
deleted file mode 100644
index 3d381da..0000000
--- a/patches/gcc/4.4.5/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/boehm-gc/include/gc.h gcc-4.4.5/boehm-gc/include/gc.h
---- gcc-4.4.5.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.5/boehm-gc/include/gc.h 2010-10-09 23:11:00.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.5/320-c99-snprintf.patch b/patches/gcc/4.4.5/320-c99-snprintf.patch
deleted file mode 100644
index c6aa06c..0000000
--- a/patches/gcc/4.4.5/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.5/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.5.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/c_global/cstdio 2010-10-09 23:11:27.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.5/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.5/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 95f7709..0000000
--- a/patches/gcc/4.4.5/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.5.orig/libmudflap/mf-hooks2.c gcc-4.4.5/libmudflap/mf-hooks2.c
---- gcc-4.4.5.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libmudflap/mf-hooks2.c 2010-10-09 23:11:52.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.5/340-ecjx-host-cc.patch b/patches/gcc/4.4.5/340-ecjx-host-cc.patch
deleted file mode 100644
index c7f6ae7..0000000
--- a/patches/gcc/4.4.5/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.4.5.orig/libjava/Makefile.in gcc-4.4.5/libjava/Makefile.in
---- gcc-4.4.5.orig/libjava/Makefile.in 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libjava/Makefile.in 2010-10-09 23:12:22.000000000 +0200
-@@ -9180,6 +9180,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.5/350-index_macro.patch b/patches/gcc/4.4.5/350-index_macro.patch
deleted file mode 100644
index 0dda11e..0000000
--- a/patches/gcc/4.4.5/350-index_macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/rope gcc-4.4.5/libstdc++-v3/include/ext/rope
---- gcc-4.4.5.orig/libstdc++-v3/include/ext/rope 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/ext/rope 2010-10-09 23:12:51.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h 2010-10-09 23:12:51.000000000 +0200
-@@ -49,6 +49,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.5/360-arm-bigendian.patch b/patches/gcc/4.4.5/360-arm-bigendian.patch
deleted file mode 100644
index 5a64290..0000000
--- a/patches/gcc/4.4.5/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-diff -durN gcc-4.4.5.orig/gcc/config/arm/linux-elf.h gcc-4.4.5/gcc/config/arm/linux-elf.h
---- gcc-4.4.5.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/linux-elf.h 2010-10-09 23:13:21.000000000 +0200
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-10-09 23:09:53.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:13:21.000000000 +0200
-@@ -739,6 +739,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
diff --git a/patches/gcc/4.4.5/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.5/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 84f62d4..0000000
--- a/patches/gcc/4.4.5/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff -durN gcc-4.4.5.orig/Makefile.in gcc-4.4.5/Makefile.in
---- gcc-4.4.5.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200
-+++ gcc-4.4.5/Makefile.in 2010-10-09 23:13:50.000000000 +0200
-@@ -245,7 +245,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff -durN gcc-4.4.5.orig/Makefile.tpl gcc-4.4.5/Makefile.tpl
---- gcc-4.4.5.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200
-+++ gcc-4.4.5/Makefile.tpl 2010-10-09 23:13:50.000000000 +0200
-@@ -248,7 +248,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.5/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.5/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index 06bc93d..0000000
--- a/patches/gcc/4.4.5/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -durN gcc-4.4.5.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.5/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.5.orig/gcc/config/t-slibgcc-elf-ver 2010-01-04 16:13:08.000000000 +0100
-+++ gcc-4.4.5/gcc/config/t-slibgcc-elf-ver 2010-10-09 23:14:18.000000000 +0200
-@@ -9,7 +9,7 @@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
- SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
- SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-diff -durN gcc-4.4.5.orig/libgcc/configure gcc-4.4.5/libgcc/configure
---- gcc-4.4.5.orig/libgcc/configure 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.5/libgcc/configure 2010-10-09 23:14:18.000000000 +0200
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3547,6 +3547,39 @@
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4267,6 +4300,7 @@
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -durN gcc-4.4.5.orig/libgcc/configure.ac gcc-4.4.5/libgcc/configure.ac
---- gcc-4.4.5.orig/libgcc/configure.ac 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.5/libgcc/configure.ac 2010-10-09 23:14:18.000000000 +0200
-@@ -223,6 +223,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -durN gcc-4.4.5.orig/libgcc/Makefile.in gcc-4.4.5/libgcc/Makefile.in
---- gcc-4.4.5.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libgcc/Makefile.in 2010-10-09 23:14:18.000000000 +0200
-@@ -39,6 +39,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -787,9 +788,10 @@
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.5/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.5/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.5/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.5/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.5/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.5/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.5/410-libgcc_eh.a.patch b/patches/gcc/4.4.5/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.5/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.4.6/100-alpha-mieee-default.patch b/patches/gcc/4.4.6/100-alpha-mieee-default.patch
deleted file mode 100644
index 5f3acd8..0000000
--- a/patches/gcc/4.4.6/100-alpha-mieee-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/alpha/alpha.h gcc-4.4.5/gcc/config/alpha/alpha.h
---- gcc-4.4.5.orig/gcc/config/alpha/alpha.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.5/gcc/config/alpha/alpha.h 2010-10-09 22:57:31.000000000 +0200
-@@ -95,6 +95,8 @@
- while (0)
- #endif
-
-+#define CPP_SPEC "%{!no-ieee:-mieee}"
-+
- #define WORD_SWITCH_TAKES_ARG(STR) \
- (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR))
-
-diff -durN gcc-4.4.5.orig/gcc/config/alpha/alpha.opt gcc-4.4.5/gcc/config/alpha/alpha.opt
---- gcc-4.4.5.orig/gcc/config/alpha/alpha.opt 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/alpha/alpha.opt 2010-10-09 22:57:31.000000000 +0200
-@@ -39,7 +39,7 @@
- Request IEEE-conformant math library routines (OSF/1)
-
- mieee
--Target Report RejectNegative Mask(IEEE)
-+Target Report Mask(IEEE)
- Emit IEEE-conformant code, without inexact exceptions
-
- mieee-with-inexact
diff --git a/patches/gcc/4.4.6/110-trampolinewarn.patch b/patches/gcc/4.4.6/110-trampolinewarn.patch
deleted file mode 100644
index 0bce857..0000000
--- a/patches/gcc/4.4.6/110-trampolinewarn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/builtins.c gcc-4.4.5/gcc/builtins.c
---- gcc-4.4.5.orig/gcc/builtins.c 2010-03-22 16:00:20.000000000 +0100
-+++ gcc-4.4.5/gcc/builtins.c 2010-10-09 22:57:58.000000000 +0200
-@@ -5783,6 +5783,9 @@
- trampolines_created = 1;
- INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
-diff -durN gcc-4.4.5.orig/gcc/common.opt gcc-4.4.5/gcc/common.opt
---- gcc-4.4.5.orig/gcc/common.opt 2009-03-28 18:28:45.000000000 +0100
-+++ gcc-4.4.5/gcc/common.opt 2010-10-09 22:57:58.000000000 +0200
-@@ -197,6 +197,10 @@
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
-
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized) Warning
- Warn about uninitialized automatic variables
diff --git a/patches/gcc/4.4.6/120-java-nomulti.patch b/patches/gcc/4.4.6/120-java-nomulti.patch
deleted file mode 100644
index aded63e..0000000
--- a/patches/gcc/4.4.6/120-java-nomulti.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
---- gcc-4.4.5.orig/libjava/configure 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libjava/configure 2010-10-09 22:58:04.000000000 +0200
-@@ -1022,6 +1022,8 @@
- default=yes
- --enable-java-maintainer-mode
- allow rebuilding of .class and .h files
-+ --enable-libjava-multilib
-+ build libjava as multilib
- --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
-@@ -1974,6 +1976,16 @@
- fi
-
-
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+ enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-
-
-diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
---- gcc-4.4.5.orig/libjava/configure.ac 2010-06-11 13:49:16.000000000 +0200
-+++ gcc-4.4.5/libjava/configure.ac 2010-10-09 22:58:04.000000000 +0200
-@@ -139,6 +139,13 @@
- [allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
-
-+AC_ARG_ENABLE(libjava-multilib,
-+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+ multilib=no
-+ ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
-
diff --git a/patches/gcc/4.4.6/130-cross-compile.patch b/patches/gcc/4.4.6/130-cross-compile.patch
deleted file mode 100644
index 72bc60e..0000000
--- a/patches/gcc/4.4.6/130-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/configure gcc-4.4.5/gcc/configure
---- gcc-4.4.5.orig/gcc/configure 2010-06-20 17:43:53.000000000 +0200
-+++ gcc-4.4.5/gcc/configure 2010-10-09 22:58:36.000000000 +0200
-@@ -13997,7 +13997,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.5.orig/gcc/configure.ac gcc-4.4.5/gcc/configure.ac
---- gcc-4.4.5.orig/gcc/configure.ac 2010-06-20 17:43:53.000000000 +0200
-+++ gcc-4.4.5/gcc/configure.ac 2010-10-09 22:58:36.000000000 +0200
-@@ -1720,7 +1720,7 @@
- | powerpc*-*-*,powerpc64*-*-*)
- CROSS="$CROSS -DNATIVE_CROSS" ;;
- esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
- SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
-
-diff -durN gcc-4.4.5.orig/gcc/unwind-dw2.c gcc-4.4.5/gcc/unwind-dw2.c
---- gcc-4.4.5.orig/gcc/unwind-dw2.c 2010-01-20 09:39:18.000000000 +0100
-+++ gcc-4.4.5/gcc/unwind-dw2.c 2010-10-09 22:58:36.000000000 +0200
-@@ -329,9 +329,11 @@
- }
- #endif
-
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
-
- /* Extract any interesting information from the CIE for the translation
- unit F belongs to. Return a pointer to the byte after the augmentation,
diff --git a/patches/gcc/4.4.6/140-default-format-security.patch b/patches/gcc/4.4.6/140-default-format-security.patch
deleted file mode 100644
index ac1d988..0000000
--- a/patches/gcc/4.4.6/140-default-format-security.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/c-common.c gcc-4.4.5/gcc/c-common.c
---- gcc-4.4.5.orig/gcc/c-common.c 2010-07-27 15:07:28.000000000 +0200
-+++ gcc-4.4.5/gcc/c-common.c 2010-10-09 22:59:03.000000000 +0200
-@@ -301,7 +301,7 @@
- /* Warn about format/argument anomalies in calls to formatted I/O functions
- (*printf, *scanf, strftime, strfmon, etc.). */
-
--int warn_format;
-+int warn_format = 1;
-
- /* Warn about using __null (as NULL in C++) as sentinel. For code compiled
- with GCC this doesn't matter as __null is guaranteed to have the right
-diff -durN gcc-4.4.5.orig/gcc/c.opt gcc-4.4.5/gcc/c.opt
---- gcc-4.4.5.orig/gcc/c.opt 2009-09-18 23:53:23.000000000 +0200
-+++ gcc-4.4.5/gcc/c.opt 2010-10-09 22:59:03.000000000 +0200
-@@ -236,7 +236,7 @@
- Warn about format strings that contain NUL bytes
-
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning
- Warn about possible security problems with format functions
-
- Wformat-y2k
-diff -durN gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
---- gcc-4.4.5.orig/gcc/doc/invoke.texi 2010-09-08 20:13:03.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/invoke.texi 2010-10-09 22:59:03.000000000 +0200
-@@ -2888,6 +2888,9 @@
- @option{-Wformat-nonliteral}, @option{-Wformat-security}, and
- @option{-Wformat=2} are available, but are not included in @option{-Wall}.
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wformat=0}.
-+
- @item -Wformat-y2k
- @opindex Wformat-y2k
- @opindex Wno-format-y2k
-@@ -2941,6 +2944,11 @@
- in future warnings may be added to @option{-Wformat-security} that are not
- included in @option{-Wformat-nonliteral}.)
-
-+NOTE: In Gentoo, this option is enabled by default for C, C++, ObjC, ObjC++.
-+To disable, use @option{-Wno-format-security}, or disable all format warnings
-+with @option{-Wformat=0}. To make format security warnings fatal, specify
-+@option{-Werror=format-security}.
-+
- @item -Wformat=2
- @opindex Wformat=2
- @opindex Wno-format=2
diff --git a/patches/gcc/4.4.6/150-default-fortify-source.patch b/patches/gcc/4.4.6/150-default-fortify-source.patch
deleted file mode 100644
index ad5a7e8..0000000
--- a/patches/gcc/4.4.6/150-default-fortify-source.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
---- gcc-4.4.5.orig/gcc/doc/invoke.texi 2010-10-09 22:59:03.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/invoke.texi 2010-10-09 22:59:33.000000000 +0200
-@@ -5432,6 +5432,11 @@
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Gentoo, @option{-D_FORTIFY_SOURCE=2} is set by default, and is
-+activated when @option{-O} is set to 2 or higher. This enables additional
-+compile-time and run-time checks for several libc functions. To disable,
-+specify either @option{-U_FORTIFY_SOURCE} or @option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-diff -durN gcc-4.4.5.orig/gcc/gcc.c gcc-4.4.5/gcc/gcc.c
---- gcc-4.4.5.orig/gcc/gcc.c 2010-01-09 01:05:06.000000000 +0100
-+++ gcc-4.4.5/gcc/gcc.c 2010-10-09 22:59:33.000000000 +0200
-@@ -807,6 +807,7 @@
- %{H} %C %{D*&U*&A*} %{i*} %Z %i\
- %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
- %{E|M|MM:%W{o*}}";
-
- /* This contains cpp options which are common with cc1_options and are passed
diff --git a/patches/gcc/4.4.6/160-netbsd-symbolic.patch b/patches/gcc/4.4.6/160-netbsd-symbolic.patch
deleted file mode 100644
index a61b078..0000000
--- a/patches/gcc/4.4.6/160-netbsd-symbolic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/netbsd-elf.h gcc-4.4.5/gcc/config/netbsd-elf.h
---- gcc-4.4.5.orig/gcc/config/netbsd-elf.h 2007-09-03 18:14:04.000000000 +0200
-+++ gcc-4.4.5/gcc/config/netbsd-elf.h 2010-10-09 22:59:57.000000000 +0200
-@@ -82,6 +82,7 @@
- #define NETBSD_LINK_SPEC_ELF \
- "%{assert*} %{R*} %{rpath*} \
- %{shared:-shared} \
-+ %{symbolic:-Bsymbolic} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
diff --git a/patches/gcc/4.4.6/170-sparc64-bsd.patch b/patches/gcc/4.4.6/170-sparc64-bsd.patch
deleted file mode 100644
index 85d9b52..0000000
--- a/patches/gcc/4.4.6/170-sparc64-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/sparc/freebsd.h gcc-4.4.5/gcc/config/sparc/freebsd.h
---- gcc-4.4.5.orig/gcc/config/sparc/freebsd.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sparc/freebsd.h 2010-10-09 23:00:03.000000000 +0200
-@@ -25,9 +25,22 @@
- /* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
--#undef CPP_CPU64_DEFAULT_SPEC
--#define CPP_CPU64_DEFAULT_SPEC \
-- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
-+#undef FBSD_TARGET_CPU_CPP_BUILTINS
-+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
-+ do \
-+ { \
-+ if (TARGET_ARCH64) \
-+ { \
-+ builtin_define ("__sparc64__"); \
-+ builtin_define ("__sparc_v9__"); \
-+ builtin_define ("__sparcv9"); \
-+ } \
-+ else \
-+ builtin_define ("__sparc"); \
-+ builtin_define ("__sparc__"); \
-+ } \
-+ while (0)
-+
-
- #define LINK_SPEC "%(link_arch) \
- %{!mno-relax:%{!r:-relax}} \
diff --git a/patches/gcc/4.4.6/180-libgomp-no-werror.patch b/patches/gcc/4.4.6/180-libgomp-no-werror.patch
deleted file mode 100644
index 35d5063..0000000
--- a/patches/gcc/4.4.6/180-libgomp-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/libgomp/configure gcc-4.4.5/libgomp/configure
---- gcc-4.4.5.orig/libgomp/configure 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libgomp/configure 2010-10-09 23:00:33.000000000 +0200
-@@ -3334,7 +3334,7 @@
-
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-- XCFLAGS="$XCFLAGS -Wall -Werror"
-+ XCFLAGS="$XCFLAGS -Wall"
- fi
-
- # Find other programs we need.
diff --git a/patches/gcc/4.4.6/190-flatten-switch-stmt-00.patch b/patches/gcc/4.4.6/190-flatten-switch-stmt-00.patch
deleted file mode 100644
index d4d68fe..0000000
--- a/patches/gcc/4.4.6/190-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/stmt.c gcc-4.4.5/gcc/stmt.c
---- gcc-4.4.5.orig/gcc/stmt.c 2010-03-08 12:46:28.000000000 +0100
-+++ gcc-4.4.5/gcc/stmt.c 2010-10-09 23:01:01.000000000 +0200
-@@ -2377,7 +2377,11 @@
- use_cost_table
- = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- && estimate_case_costs (case_list));
-- balance_case_nodes (&case_list, NULL);
-+ /* When optimizing for size, we want a straight list to avoid
-+ jumps as much as possible. This basically creates an if-else
-+ chain. */
-+ if (!optimize_size)
-+ balance_case_nodes (&case_list, NULL);
- emit_case_nodes (index, case_list, default_label, index_type);
- if (default_label)
- emit_jump (default_label);
-@@ -2943,6 +2947,7 @@
- {
- if (!node_has_low_bound (node, index_type))
- {
-+ if (!optimize_size) /* don't jl to the .default_label. */
- emit_cmp_and_jump_insns (index,
- convert_modes
- (mode, imode,
diff --git a/patches/gcc/4.4.6/200-libiberty.h-asprintf.patch b/patches/gcc/4.4.6/200-libiberty.h-asprintf.patch
deleted file mode 100644
index 19e4523..0000000
--- a/patches/gcc/4.4.6/200-libiberty.h-asprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN gcc-4.4.5.orig/include/libiberty.h gcc-4.4.5/include/libiberty.h
---- gcc-4.4.5.orig/include/libiberty.h 2008-06-24 03:42:31.000000000 +0200
-+++ gcc-4.4.5/include/libiberty.h 2010-10-09 23:01:30.000000000 +0200
-@@ -595,8 +595,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/patches/gcc/4.4.6/210-arm-unbreak-armv4t.patch b/patches/gcc/4.4.6/210-arm-unbreak-armv4t.patch
deleted file mode 100644
index 396a80b..0000000
--- a/patches/gcc/4.4.6/210-arm-unbreak-armv4t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/arm/linux-eabi.h gcc-4.4.5/gcc/config/arm/linux-eabi.h
---- gcc-4.4.5.orig/gcc/config/arm/linux-eabi.h 2007-11-08 14:44:09.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/linux-eabi.h 2010-10-09 23:01:59.000000000 +0200
-@@ -44,7 +44,7 @@
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
- #undef SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
-
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
- config.gcc for big endian configurations. */
diff --git a/patches/gcc/4.4.6/220-libiberty-pic.patch b/patches/gcc/4.4.6/220-libiberty-pic.patch
deleted file mode 100644
index 93b180a..0000000
--- a/patches/gcc/4.4.6/220-libiberty-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN gcc-4.4.5.orig/libiberty/Makefile.in gcc-4.4.5/libiberty/Makefile.in
---- gcc-4.4.5.orig/libiberty/Makefile.in 2008-10-22 15:30:19.000000000 +0200
-+++ gcc-4.4.5/libiberty/Makefile.in 2010-10-09 23:02:28.000000000 +0200
-@@ -227,6 +227,7 @@
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc/4.4.6/230-superh-default-multilib.patch b/patches/gcc/4.4.6/230-superh-default-multilib.patch
deleted file mode 100644
index 0df23a9..0000000
--- a/patches/gcc/4.4.6/230-superh-default-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-06-14 00:16:50.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:02:56.000000000 +0200
-@@ -2140,7 +2140,7 @@
- if test x${sh_multilibs} = x ; then
- case ${target} in
- sh64-superh-linux* | \
-- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 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 ;;
diff --git a/patches/gcc/4.4.6/240-libstdc++-pic.patch b/patches/gcc/4.4.6/240-libstdc++-pic.patch
deleted file mode 100644
index 4dde5a1..0000000
--- a/patches/gcc/4.4.6/240-libstdc++-pic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am gcc-4.4.5/libstdc++-v3/src/Makefile.am
---- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/src/Makefile.am 2010-10-09 23:03:26.000000000 +0200
-@@ -356,6 +356,13 @@
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
-
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
-diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in gcc-4.4.5/libstdc++-v3/src/Makefile.in
---- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in 2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/src/Makefile.in 2010-10-09 23:03:26.000000000 +0200
-@@ -726,7 +726,7 @@
-
- install-data-am: install-data-local
-
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
-
- install-info: install-info-am
-
-@@ -765,7 +765,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
-- uninstall-toolexeclibLTLIBRARIES
-+ uninstall-toolexeclibLTLIBRARIES install-exec-local
-
-
- # Symbol versioning for shared libraries.
-@@ -947,6 +947,14 @@
- install_debug:
- (cd ${debugdir} && $(MAKE) \
- toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
-+ if [ x"$$pic_objs" != x ]; then \
-+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
-+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
-+ fi
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/gcc/4.4.6/250-ia64-noteGNUstack.patch b/patches/gcc/4.4.6/250-ia64-noteGNUstack.patch
deleted file mode 100644
index 6d128e4..0000000
--- a/patches/gcc/4.4.6/250-ia64-noteGNUstack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.5/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtbegin.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtbegin.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtend.asm gcc-4.4.5/gcc/config/ia64/crtend.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtend.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtend.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -119,3 +119,7 @@
-
- br.ret.sptk.many rp
- .endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crti.asm gcc-4.4.5/gcc/config/ia64/crti.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crti.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crti.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -51,3 +51,7 @@
- .body
-
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/crtn.asm gcc-4.4.5/gcc/config/ia64/crtn.asm
---- gcc-4.4.5.orig/gcc/config/ia64/crtn.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/crtn.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -41,3 +41,7 @@
- br.ret.sptk.many b0
-
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.5/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.5.orig/gcc/config/ia64/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/ia64/lib1funcs.asm 2010-10-09 23:03:55.000000000 +0200
-@@ -793,3 +793,7 @@
- .endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -durN gcc-4.4.5.orig/gcc/config/ia64/linux.h gcc-4.4.5/gcc/config/ia64/linux.h
---- gcc-4.4.5.orig/gcc/config/ia64/linux.h 2009-02-12 17:30:53.000000000 +0100
-+++ gcc-4.4.5/gcc/config/ia64/linux.h 2010-10-09 23:03:55.000000000 +0200
-@@ -5,6 +5,8 @@
-
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
-
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -durN gcc-4.4.5.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.5/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.5.orig/gcc/config/rs6000/ppc-asm.h 2008-10-13 17:44:26.000000000 +0200
-+++ gcc-4.4.5/gcc/config/rs6000/ppc-asm.h 2010-10-09 23:03:55.000000000 +0200
-@@ -172,7 +172,7 @@
- .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
-
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- .section .note.GNU-stack
- .previous
- #endif
diff --git a/patches/gcc/4.4.6/260-sh-libgcc-stacks.patch b/patches/gcc/4.4.6/260-sh-libgcc-stacks.patch
deleted file mode 100644
index cc6baf3..0000000
--- a/patches/gcc/4.4.6/260-sh-libgcc-stacks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.5/gcc/config/sh/lib1funcs.asm
---- gcc-4.4.5.orig/gcc/config/sh/lib1funcs.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sh/lib1funcs.asm 2010-10-09 23:04:22.000000000 +0200
-@@ -30,6 +30,11 @@
- !! recoded in assembly by Toshiyasu Morita
- !! tm@netcom.com
-
-+#if defined(__ELF__) && defined(__linux__)
-+.section .note.GNU-stack,"",%progbits
-+.previous
-+#endif
-+
- /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
- ELF local label prefixes by J"orn Rennecke
- amylaar@cygnus.com */
-diff -durN gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.5/gcc/config/sh/linux-atomic.asm
---- gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sh/linux-atomic.asm 2010-10-09 23:04:22.000000000 +0200
-@@ -136,3 +136,6 @@
- ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
-
- #endif /* ! __SH5__ */
-+
-+.section .note.GNU-stack,"",%progbits
-+.previous
diff --git a/patches/gcc/4.4.6/270-sh-pr24836.patch b/patches/gcc/4.4.6/270-sh-pr24836.patch
deleted file mode 100644
index 11ca63d..0000000
--- a/patches/gcc/4.4.6/270-sh-pr24836.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/configure gcc-4.4.5/gcc/configure
---- gcc-4.4.5.orig/gcc/configure 2010-10-09 22:58:36.000000000 +0200
-+++ gcc-4.4.5/gcc/configure 2010-10-09 23:04:50.000000000 +0200
-@@ -22285,7 +22285,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
-diff -durN gcc-4.4.5.orig/gcc/configure.ac gcc-4.4.5/gcc/configure.ac
---- gcc-4.4.5.orig/gcc/configure.ac 2010-10-09 22:58:36.000000000 +0200
-+++ gcc-4.4.5/gcc/configure.ac 2010-10-09 23:04:50.000000000 +0200
-@@ -2728,7 +2728,7 @@
- tls_first_minor=14
- tls_as_opt="-m64 -Aesame --fatal-warnings"
- ;;
-- sh-*-* | sh[34]-*-*)
-+ sh-*-* | sh[34]*-*-*)
- conftest_s='
- .section ".tdata","awT",@progbits
- foo: .long 25
diff --git a/patches/gcc/4.4.6/280-freebsd.patch b/patches/gcc/4.4.6/280-freebsd.patch
deleted file mode 100644
index e26b34a..0000000
--- a/patches/gcc/4.4.6/280-freebsd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/freebsd-spec.h gcc-4.4.5/gcc/config/freebsd-spec.h
---- gcc-4.4.5.orig/gcc/config/freebsd-spec.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/config/freebsd-spec.h 2010-10-09 23:09:53.000000000 +0200
-@@ -61,6 +61,8 @@
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
-+ if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99))) \
-+ builtin_define("_LONGLONG"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-diff -durN gcc-4.4.5.orig/gcc/config/t-freebsd-eh gcc-4.4.5/gcc/config/t-freebsd-eh
---- gcc-4.4.5.orig/gcc/config/t-freebsd-eh 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/t-freebsd-eh 2010-10-09 23:09:53.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Use unwind-dw2-fde-glibc
-+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
-+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-10-09 23:02:56.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:09:53.000000000 +0200
-@@ -456,7 +456,7 @@
- # pleases around the provided core setting.
- gas=yes
- gnu_ld=yes
-- extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.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"
-@@ -1048,6 +1048,10 @@
- ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+ if test ${fbsd_major} -ge 7; then
-+ tmake_file="${tmake_file} t-freebsd-eh"
-+ fi
- ;;
- 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"
-diff -durN gcc-4.4.5.orig/gcc/crtstuff.c gcc-4.4.5/gcc/crtstuff.c
---- gcc-4.4.5.orig/gcc/crtstuff.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/crtstuff.c 2010-10-09 23:09:53.000000000 +0200
-@@ -85,13 +85,15 @@
- && !defined(OBJECT_FORMAT_FLAT) \
- && defined(HAVE_LD_EH_FRAME_HDR) \
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-- && defined(__GLIBC__) && __GLIBC__ >= 2
-+ && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
- # if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022)
- # define USE_PT_GNU_EH_FRAME
- # endif
- #endif
-diff -durN gcc-4.4.5.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.5/gcc/unwind-dw2-fde-glibc.c
---- gcc-4.4.5.orig/gcc/unwind-dw2-fde-glibc.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/gcc/unwind-dw2-fde-glibc.c 2010-10-09 23:09:53.000000000 +0200
-@@ -46,8 +46,9 @@
- #include "gthr.h"
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+ && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
-+ || (__FreeBSD_version >= 700022 ))
-
- #ifndef __RELOC_POINTER
- # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
-@@ -63,6 +64,13 @@
- #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
- #endif
-
-+/* Support FreeBSD */
-+#ifndef ElfW
-+# ifdef __ElfN
-+# define ElfW __ElfN
-+# endif
-+#endif
-+
- struct unw_eh_callback_data
- {
- _Unwind_Ptr pc;
diff --git a/patches/gcc/4.4.6/290-freebsd.patch b/patches/gcc/4.4.6/290-freebsd.patch
deleted file mode 100644
index 88d632e..0000000
--- a/patches/gcc/4.4.6/290-freebsd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -durN gcc-4.4.5.orig/gcc/config/freebsd-spec.h gcc-4.4.5/gcc/config/freebsd-spec.h
---- gcc-4.4.5.orig/gcc/config/freebsd-spec.h 2010-10-09 23:09:53.000000000 +0200
-+++ gcc-4.4.5/gcc/config/freebsd-spec.h 2010-10-09 23:10:02.000000000 +0200
-@@ -86,9 +86,10 @@
- #define FBSD_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}"
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -126,7 +127,8 @@
- %{pg: -lc_p} \
- }"
- #else
--#if FBSD_MAJOR < 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500016
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: \
-@@ -136,17 +138,34 @@
- %{!pthread:-lc_p} \
- %{pthread:-lc_r_p}} \
- }"
--#else
-+#elif __FreeBSD_version < 700022
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lpthread} -lc} \
- %{pg: %{pthread:-lpthread_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p}} \
-+ %{shared: \
-+ %{pthread:-lpthread} -lc} \
-+ "
- #endif
- #endif
-
--#if FBSD_MAJOR < 6
-+#if FBSD_MAJOR < 5
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
- #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
- #endif
-+
-+#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#endif
-+
-+/* Use --as-needed -lgcc_s for eh support. */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
diff --git a/patches/gcc/4.4.6/300-uclibc-conf.patch b/patches/gcc/4.4.6/300-uclibc-conf.patch
deleted file mode 100644
index b1465e0..0000000
--- a/patches/gcc/4.4.6/300-uclibc-conf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -durN gcc-4.4.5.orig/contrib/regression/objs-gcc.sh gcc-4.4.5/contrib/regression/objs-gcc.sh
---- gcc-4.4.5.orig/contrib/regression/objs-gcc.sh 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/contrib/regression/objs-gcc.sh 2010-10-09 23:10:32.000000000 +0200
-@@ -106,6 +106,10 @@
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
-diff -durN gcc-4.4.5.orig/libjava/classpath/ltconfig gcc-4.4.5/libjava/classpath/ltconfig
---- gcc-4.4.5.orig/libjava/classpath/ltconfig 2007-06-04 01:18:43.000000000 +0200
-+++ gcc-4.4.5/libjava/classpath/ltconfig 2010-10-09 23:10:32.000000000 +0200
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/patches/gcc/4.4.6/310-missing-execinfo_h.patch b/patches/gcc/4.4.6/310-missing-execinfo_h.patch
deleted file mode 100644
index 3d381da..0000000
--- a/patches/gcc/4.4.6/310-missing-execinfo_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/boehm-gc/include/gc.h gcc-4.4.5/boehm-gc/include/gc.h
---- gcc-4.4.5.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.4.5/boehm-gc/include/gc.h 2010-10-09 23:11:00.000000000 +0200
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-- && !defined(__ia64__)
-+ && !defined(__ia64__) && !defined(__UCLIBC__)
- # ifndef GC_HAVE_BUILTIN_BACKTRACE
- # define GC_HAVE_BUILTIN_BACKTRACE
- # endif
diff --git a/patches/gcc/4.4.6/320-c99-snprintf.patch b/patches/gcc/4.4.6/320-c99-snprintf.patch
deleted file mode 100644
index c6aa06c..0000000
--- a/patches/gcc/4.4.6/320-c99-snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/c_global/cstdio gcc-4.4.5/libstdc++-v3/include/c_global/cstdio
---- gcc-4.4.5.orig/libstdc++-v3/include/c_global/cstdio 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/c_global/cstdio 2010-10-09 23:11:27.000000000 +0200
-@@ -139,7 +139,7 @@
-
- _GLIBCXX_END_NAMESPACE
-
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
-
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.4.6/330-libmudflap-susv3-legacy.patch b/patches/gcc/4.4.6/330-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 95f7709..0000000
--- a/patches/gcc/4.4.6/330-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -durN gcc-4.4.5.orig/libmudflap/mf-hooks2.c gcc-4.4.5/libmudflap/mf-hooks2.c
---- gcc-4.4.5.orig/libmudflap/mf-hooks2.c 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libmudflap/mf-hooks2.c 2010-10-09 23:11:52.000000000 +0200
-@@ -421,7 +421,7 @@
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -431,7 +431,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -441,7 +441,7 @@
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -450,7 +450,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -459,7 +459,7 @@
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc/4.4.6/340-ecjx-host-cc.patch b/patches/gcc/4.4.6/340-ecjx-host-cc.patch
deleted file mode 100644
index c7f6ae7..0000000
--- a/patches/gcc/4.4.6/340-ecjx-host-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.4.5.orig/libjava/Makefile.in gcc-4.4.5/libjava/Makefile.in
---- gcc-4.4.5.orig/libjava/Makefile.in 2010-10-01 10:26:18.000000000 +0200
-+++ gcc-4.4.5/libjava/Makefile.in 2010-10-09 23:12:22.000000000 +0200
-@@ -9180,6 +9180,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.4.6/350-index_macro.patch b/patches/gcc/4.4.6/350-index_macro.patch
deleted file mode 100644
index 0dda11e..0000000
--- a/patches/gcc/4.4.6/350-index_macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
--= BEGIN original header =-
-Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
--= END original header =-
-
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/rope gcc-4.4.5/libstdc++-v3/include/ext/rope
---- gcc-4.4.5.orig/libstdc++-v3/include/ext/rope 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/ext/rope 2010-10-09 23:12:51.000000000 +0200
-@@ -54,6 +54,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- # define __GC_CONST const
- # else
-diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h
---- gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h 2010-10-09 23:12:51.000000000 +0200
-@@ -49,6 +49,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
-
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
diff --git a/patches/gcc/4.4.6/360-arm-bigendian.patch b/patches/gcc/4.4.6/360-arm-bigendian.patch
deleted file mode 100644
index 5a64290..0000000
--- a/patches/gcc/4.4.6/360-arm-bigendian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-diff -durN gcc-4.4.5.orig/gcc/config/arm/linux-elf.h gcc-4.4.5/gcc/config/arm/linux-elf.h
---- gcc-4.4.5.orig/gcc/config/arm/linux-elf.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/linux-elf.h 2010-10-09 23:13:21.000000000 +0200
-@@ -51,7 +51,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-diff -durN gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
---- gcc-4.4.5.orig/gcc/config.gcc 2010-10-09 23:09:53.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc 2010-10-09 23:13:21.000000000 +0200
-@@ -739,6 +739,11 @@
- 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*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-uclinux*eabi)
- tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
diff --git a/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch
deleted file mode 100644
index 84f62d4..0000000
--- a/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-ChangeLog:
-2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- PR bootstrap/41818
- * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
- to $(RPATH_ENVVAR) if bootstrapping.
- * Makefile.in: Regenerate.
-
-diff -durN gcc-4.4.5.orig/Makefile.in gcc-4.4.5/Makefile.in
---- gcc-4.4.5.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200
-+++ gcc-4.4.5/Makefile.in 2010-10-09 23:13:50.000000000 +0200
-@@ -245,7 +245,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
-diff -durN gcc-4.4.5.orig/Makefile.tpl gcc-4.4.5/Makefile.tpl
---- gcc-4.4.5.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200
-+++ gcc-4.4.5/Makefile.tpl 2010-10-09 23:13:50.000000000 +0200
-@@ -248,7 +248,10 @@
- STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
- RAW_CXX_TARGET_EXPORTS = \
- $(BASE_TARGET_EXPORTS) \
diff --git a/patches/gcc/4.4.6/380-powerpc-libgcc_s-link-libm.patch b/patches/gcc/4.4.6/380-powerpc-libgcc_s-link-libm.patch
deleted file mode 100644
index 06bc93d..0000000
--- a/patches/gcc/4.4.6/380-powerpc-libgcc_s-link-libm.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-
-diff -durN gcc-4.4.5.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.5/gcc/config/t-slibgcc-elf-ver
---- gcc-4.4.5.orig/gcc/config/t-slibgcc-elf-ver 2010-01-04 16:13:08.000000000 +0100
-+++ gcc-4.4.5/gcc/config/t-slibgcc-elf-ver 2010-10-09 23:14:18.000000000 +0200
-@@ -9,7 +9,7 @@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
--SHLIB_LC = -lc
-+SHLIB_LC = @libgcc_libm@ -lc
- SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
- SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-diff -durN gcc-4.4.5.orig/libgcc/configure gcc-4.4.5/libgcc/configure
---- gcc-4.4.5.orig/libgcc/configure 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.5/libgcc/configure 2010-10-09 23:14:18.000000000 +0200
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=''
-
- ac_unique_file="static-object.mk"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- ac_pwd=`pwd`
-
-@@ -3547,6 +3547,39 @@
- fi
-
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-@@ -4267,6 +4300,7 @@
- s,@fixed_point@,$fixed_point,;t t
- s,@vis_hide@,$vis_hide,;t t
- s,@set_have_cc_tls@,$set_have_cc_tls,;t t
-+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
- s,@tmake_file@,$tmake_file,;t t
- s,@extra_parts@,$extra_parts,;t t
- s,@asm_hidden_op@,$asm_hidden_op,;t t
-diff -durN gcc-4.4.5.orig/libgcc/configure.ac gcc-4.4.5/libgcc/configure.ac
---- gcc-4.4.5.orig/libgcc/configure.ac 2008-11-20 18:13:01.000000000 +0100
-+++ gcc-4.4.5/libgcc/configure.ac 2010-10-09 23:14:18.000000000 +0200
-@@ -223,6 +223,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
-
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+ libgcc_cv_copysignl_lib,
-+ echo '#include <features.h>' > conftest.c
-+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+ libgcc_cv_copysignl_lib="-lc"
-+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+ then
-+ libgcc_cv_copysignl_lib="-lm"
-+ fi
-+ rm -f conftest.*
-+ ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+ *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- for f in ${tmake_file}
-diff -durN gcc-4.4.5.orig/libgcc/Makefile.in gcc-4.4.5/libgcc/Makefile.in
---- gcc-4.4.5.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.5/libgcc/Makefile.in 2010-10-09 23:14:18.000000000 +0200
-@@ -39,6 +39,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
-
-@@ -787,9 +788,10 @@
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
-+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- @shlib_map_file@,$(mapfile),$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
-- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
-
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- # @multilib_flags@ is still needed because this may use
diff --git a/patches/gcc/4.4.6/390-arm-softfloat-libgcc.patch b/patches/gcc/4.4.6/390-arm-softfloat-libgcc.patch
deleted file mode 100644
index e6a30a3..0000000
--- a/patches/gcc/4.4.6/390-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gcc/config/arm/linux-elf.h | 2 +-
- gcc/config/arm/t-linux | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.4.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.4.0/gcc/config/arm/t-linux
-@@ -4,7 +4,11 @@
-
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
-- _arm_addsubdf3 _arm_addsubsf3
-+ _arm_addsubdf3 _arm_addsubsf3 \
-+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+ _arm_fixsfsi _arm_fixunssfsi
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
diff --git a/patches/gcc/4.4.6/400-pr42289-fix-libffi-build-on-arm-oabi.patch b/patches/gcc/4.4.6/400-pr42289-fix-libffi-build-on-arm-oabi.patch
deleted file mode 100644
index 8654879..0000000
--- a/patches/gcc/4.4.6/400-pr42289-fix-libffi-build-on-arm-oabi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.3.4/libffi/src/arm/sysv.S
-+++ gcc-4.3.4/libffi/src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- stmfd sp!, {ip, lr}
- UNWIND .save {r0, lr}
- add r2, sp, #8
-- .pad #16
-+ UNWIND .pad #16
- sub sp, sp, #16
- str sp, [sp, #8]
- add r1, sp, #8
diff --git a/patches/gcc/4.4.6/410-libgcc_eh.a.patch b/patches/gcc/4.4.6/410-libgcc_eh.a.patch
deleted file mode 100644
index 4753260..0000000
--- a/patches/gcc/4.4.6/410-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in
---- gcc-4.4.0.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.0/libgcc/Makefile.in 2011-09-12 17:05:25.121124559 +0200
-@@ -754,8 +754,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -924,10 +925,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -942,6 +939,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.5.0/100-ecjx-host.patch b/patches/gcc/4.5.0/100-ecjx-host.patch
deleted file mode 100644
index ea6aa50..0000000
--- a/patches/gcc/4.5.0/100-ecjx-host.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.5.2.orig/libjava/Makefile.in gcc-4.5.2/libjava/Makefile.in
---- gcc-4.5.2.orig/libjava/Makefile.in 2010-12-16 13:49:03.000000000 +0100
-+++ gcc-4.5.2/libjava/Makefile.in 2010-12-29 23:02:41.000000000 +0100
-@@ -9463,6 +9463,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.5.0/110-libgcc_eh.a.patch b/patches/gcc/4.5.0/110-libgcc_eh.a.patch
deleted file mode 100644
index 4cc019e..0000000
--- a/patches/gcc/4.5.0/110-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.5.0.orig/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
---- gcc-4.5.0.orig/libgcc/Makefile.in 2010-03-30 15:08:52.000000000 +0200
-+++ gcc-4.5.0/libgcc/Makefile.in 2011-09-12 17:46:51.342800731 +0200
-@@ -765,8 +765,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -935,10 +936,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -953,6 +950,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.5.1/100-ecjx-host.patch b/patches/gcc/4.5.1/100-ecjx-host.patch
deleted file mode 100644
index ea6aa50..0000000
--- a/patches/gcc/4.5.1/100-ecjx-host.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.5.2.orig/libjava/Makefile.in gcc-4.5.2/libjava/Makefile.in
---- gcc-4.5.2.orig/libjava/Makefile.in 2010-12-16 13:49:03.000000000 +0100
-+++ gcc-4.5.2/libjava/Makefile.in 2010-12-29 23:02:41.000000000 +0100
-@@ -9463,6 +9463,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.5.1/110-libgcc_eh.a.patch b/patches/gcc/4.5.1/110-libgcc_eh.a.patch
deleted file mode 100644
index 4cc019e..0000000
--- a/patches/gcc/4.5.1/110-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.5.0.orig/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
---- gcc-4.5.0.orig/libgcc/Makefile.in 2010-03-30 15:08:52.000000000 +0200
-+++ gcc-4.5.0/libgcc/Makefile.in 2011-09-12 17:46:51.342800731 +0200
-@@ -765,8 +765,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -935,10 +936,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -953,6 +950,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.5.2/100-ecjx-host.patch b/patches/gcc/4.5.2/100-ecjx-host.patch
deleted file mode 100644
index ea6aa50..0000000
--- a/patches/gcc/4.5.2/100-ecjx-host.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -durN gcc-4.5.2.orig/libjava/Makefile.in gcc-4.5.2/libjava/Makefile.in
---- gcc-4.5.2.orig/libjava/Makefile.in 2010-12-16 13:49:03.000000000 +0100
-+++ gcc-4.5.2/libjava/Makefile.in 2010-12-29 23:02:41.000000000 +0100
-@@ -9463,6 +9463,9 @@
- ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
- @rm -f ecjx$(EXEEXT)
- $(ecjx_LINK) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
-+ecjx.$(OBJEXT): $(ecjx_SOURCES)
-+ @rm -f ecjx.$(OBJEXT)
-+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
- gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
- @rm -f gappletviewer$(EXEEXT)
- $(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
diff --git a/patches/gcc/4.5.2/110-libgcc_eh.a.patch b/patches/gcc/4.5.2/110-libgcc_eh.a.patch
deleted file mode 100644
index 4cc019e..0000000
--- a/patches/gcc/4.5.2/110-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.5.0.orig/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
---- gcc-4.5.0.orig/libgcc/Makefile.in 2010-03-30 15:08:52.000000000 +0200
-+++ gcc-4.5.0/libgcc/Makefile.in 2011-09-12 17:46:51.342800731 +0200
-@@ -765,8 +765,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -935,10 +936,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -953,6 +950,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.5.3/120-siginfo.patch b/patches/gcc/4.5.3/120-siginfo.patch
deleted file mode 100644
index fbadb66..0000000
--- a/patches/gcc/4.5.3/120-siginfo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h
-index e43aacf..3b52101 100644
---- a/gcc/config/alpha/linux-unwind.h
-+++ b/gcc/config/alpha/linux-unwind.h
-@@ -48,7 +48,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
- else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */
- {
- struct rt_sigframe {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- } *rt_ = context->cfa;
- sc = &rt_->uc.uc_mcontext;
-diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h
-index 88c8285..419f72d 100644
---- a/gcc/config/bfin/linux-unwind.h
-+++ b/gcc/config/bfin/linux-unwind.h
-@@ -51,7 +51,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
- struct siginfo *pinfo;
- void *puc;
- char retcode[8];
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- } *rt_ = context->cfa;
-
-diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h
-index 93f762d..baf80ee 100644
---- a/gcc/config/ia64/linux-unwind.h
-+++ b/gcc/config/ia64/linux-unwind.h
-@@ -47,7 +47,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context,
- struct sigframe {
- char scratch[16];
- unsigned long sig_number;
-- struct siginfo *info;
-+ siginfo_t *info;
- struct sigcontext *sc;
- } *frame_ = (struct sigframe *)context->psp;
- struct sigcontext *sc = frame_->sc;
-@@ -137,7 +137,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs)
- struct sigframe {
- char scratch[16];
- unsigned long sig_number;
-- struct siginfo *info;
-+ siginfo_t *info;
- struct sigcontext *sc;
- } *frame = (struct sigframe *)context->psp;
- struct sigcontext *sc = frame->sc;
-diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h
-index 02f7cd5..69d96f1 100644
---- a/gcc/config/mips/linux-unwind.h
-+++ b/gcc/config/mips/linux-unwind.h
-@@ -75,7 +75,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context,
- 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/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h
-index a0560e9..dd8f590 100644
---- a/gcc/config/pa/linux-unwind.h
-+++ b/gcc/config/pa/linux-unwind.h
-@@ -63,7 +63,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
- int i;
- struct sigcontext *sc;
- struct rt_sigframe {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- } *frame;
-
-diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
-index 94ed95d..c1e1adb 100644
---- a/gcc/config/sh/linux-unwind.h
-+++ b/gcc/config/sh/linux-unwind.h
-@@ -80,9 +80,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context,
- && (*(unsigned long *) (pc+11) == 0x6ff0fff0))
- {
- struct rt_sigframe {
-- 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.
-@@ -179,7 +179,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
- && (*(unsigned short *) (pc+14) == 0x00ad))))
- {
- struct rt_sigframe {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- } *rt_ = context->cfa;
- /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h
-index 32e9349..dda1f29 100644
---- a/gcc/config/xtensa/linux-unwind.h
-+++ b/gcc/config/xtensa/linux-unwind.h
-@@ -62,7 +62,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
- struct sigcontext *sc;
-
- struct rt_sigframe {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- } *rt_;
-
diff --git a/patches/gcc/4.5.3/100-ecjx-host.patch b/patches/gcc/4.5.4/100-ecjx-host.patch
index ea6aa50..ea6aa50 100644
--- a/patches/gcc/4.5.3/100-ecjx-host.patch
+++ b/patches/gcc/4.5.4/100-ecjx-host.patch
diff --git a/patches/gcc/4.5.3/110-libgcc_eh.a.patch b/patches/gcc/4.5.4/110-libgcc_eh.a.patch
index 4cc019e..4cc019e 100644
--- a/patches/gcc/4.5.3/110-libgcc_eh.a.patch
+++ b/patches/gcc/4.5.4/110-libgcc_eh.a.patch
diff --git a/patches/gcc/4.6.0/000-gcc-bug-54369.patch b/patches/gcc/4.6.0/000-gcc-bug-54369.patch
deleted file mode 100644
index 1cdb659..0000000
--- a/patches/gcc/4.6.0/000-gcc-bug-54369.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: ebotcazou
-Date: Sun Sep 2 10:37:49 2012
-New Revision: 190860
-
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190860
-Log:
- PR rtl-optimization/54369
- * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
- calling dbr_schedule.
- * config/sparc/sparc.c (sparc_reorg): Likewise.
-
-Modified:
- branches/gcc-4_6-branch/gcc/ChangeLog
- branches/gcc-4_6-branch/gcc/config/mips/mips.c
- branches/gcc-4_6-branch/gcc/config/sparc/sparc.c
-
-[yann.morin.1998@free.fr: remove the sparc part, it does not apply]
-
----
---- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860
-@@ -15083,7 +15083,10 @@
- }
-
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
- mips_reorg_process_insns ();
- if (!TARGET_MIPS16
- && TARGET_EXPLICIT_RELOCS
diff --git a/patches/gcc/4.6.0/100-libgcc_eh.a.patch b/patches/gcc/4.6.0/100-libgcc_eh.a.patch
deleted file mode 100644
index 74ae897..0000000
--- a/patches/gcc/4.6.0/100-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.6.1/000-gcc-bug-54369.patch b/patches/gcc/4.6.1/000-gcc-bug-54369.patch
deleted file mode 100644
index 1cdb659..0000000
--- a/patches/gcc/4.6.1/000-gcc-bug-54369.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: ebotcazou
-Date: Sun Sep 2 10:37:49 2012
-New Revision: 190860
-
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190860
-Log:
- PR rtl-optimization/54369
- * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
- calling dbr_schedule.
- * config/sparc/sparc.c (sparc_reorg): Likewise.
-
-Modified:
- branches/gcc-4_6-branch/gcc/ChangeLog
- branches/gcc-4_6-branch/gcc/config/mips/mips.c
- branches/gcc-4_6-branch/gcc/config/sparc/sparc.c
-
-[yann.morin.1998@free.fr: remove the sparc part, it does not apply]
-
----
---- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860
-@@ -15083,7 +15083,10 @@
- }
-
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
- mips_reorg_process_insns ();
- if (!TARGET_MIPS16
- && TARGET_EXPLICIT_RELOCS
diff --git a/patches/gcc/4.6.1/100-libgcc_eh.a.patch b/patches/gcc/4.6.1/100-libgcc_eh.a.patch
deleted file mode 100644
index 74ae897..0000000
--- a/patches/gcc/4.6.1/100-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.6.2/000-gcc-bug-54369.patch b/patches/gcc/4.6.2/000-gcc-bug-54369.patch
deleted file mode 100644
index b91f0eb..0000000
--- a/patches/gcc/4.6.2/000-gcc-bug-54369.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: ebotcazou
-Date: Sun Sep 2 10:37:49 2012
-New Revision: 190860
-
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190860
-Log:
- PR rtl-optimization/54369
- * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
- calling dbr_schedule.
- * config/sparc/sparc.c (sparc_reorg): Likewise.
-
-Modified:
- branches/gcc-4_6-branch/gcc/ChangeLog
- branches/gcc-4_6-branch/gcc/config/mips/mips.c
- branches/gcc-4_6-branch/gcc/config/sparc/sparc.c
----
---- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860
-@@ -15083,7 +15083,10 @@
- }
-
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
- mips_reorg_process_insns ();
- if (!TARGET_MIPS16
- && TARGET_EXPLICIT_RELOCS
---- gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:37:49 190860
-@@ -9456,7 +9456,10 @@
- /* We need to have the (essentially) final form of the insn stream in order
- to properly detect the various hazards. Run delay slot scheduling. */
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
-
- /* Now look for specific patterns in the insn stream. */
- for (insn = get_insns (); insn; insn = next)
-
diff --git a/patches/gcc/4.6.2/100-libgcc_eh.a.patch b/patches/gcc/4.6.2/100-libgcc_eh.a.patch
deleted file mode 100644
index 74ae897..0000000
--- a/patches/gcc/4.6.2/100-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.6.3/000-gcc-bug-54369.patch b/patches/gcc/4.6.3/000-gcc-bug-54369.patch
deleted file mode 100644
index b91f0eb..0000000
--- a/patches/gcc/4.6.3/000-gcc-bug-54369.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: ebotcazou
-Date: Sun Sep 2 10:37:49 2012
-New Revision: 190860
-
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190860
-Log:
- PR rtl-optimization/54369
- * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
- calling dbr_schedule.
- * config/sparc/sparc.c (sparc_reorg): Likewise.
-
-Modified:
- branches/gcc-4_6-branch/gcc/ChangeLog
- branches/gcc-4_6-branch/gcc/config/mips/mips.c
- branches/gcc-4_6-branch/gcc/config/sparc/sparc.c
----
---- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860
-@@ -15083,7 +15083,10 @@
- }
-
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
- mips_reorg_process_insns ();
- if (!TARGET_MIPS16
- && TARGET_EXPLICIT_RELOCS
---- gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859
-+++ gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:37:49 190860
-@@ -9456,7 +9456,10 @@
- /* We need to have the (essentially) final form of the insn stream in order
- to properly detect the various hazards. Run delay slot scheduling. */
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
-
- /* Now look for specific patterns in the insn stream. */
- for (insn = get_insns (); insn; insn = next)
-
diff --git a/patches/gcc/4.6.3/100-libgcc_eh.a.patch b/patches/gcc/4.6.3/100-libgcc_eh.a.patch
deleted file mode 100644
index 74ae897..0000000
--- a/patches/gcc/4.6.3/100-libgcc_eh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
- http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
-
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
- install-shared:
- $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-
-- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
-
-+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- parts="$(INSTALL_PARTS)"; \
- for file in $$parts; do \
- rm -f $(DESTDIR)$(inst_libdir)/$$file; \
diff --git a/patches/gcc/4.7.0/000-gcc-bug-54369.patch b/patches/gcc/4.7.0/000-gcc-bug-54369.patch
deleted file mode 100644
index 60a88b9..0000000
--- a/patches/gcc/4.7.0/000-gcc-bug-54369.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: ebotcazou
-Date: Sun Sep 2 10:36:54 2012
-New Revision: 190859
-
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190859
-Log:
- PR rtl-optimization/54369
- * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
- calling dbr_schedule.
- * config/sparc/sparc.c (sparc_reorg): Likewise.
-
-Modified:
- branches/gcc-4_7-branch/gcc/ChangeLog
- branches/gcc-4_7-branch/gcc/config/mips/mips.c
- branches/gcc-4_7-branch/gcc/config/sparc/sparc.c
----
---- gcc-4_7-branch/gcc/config/mips/mips.c 2012/09/02 10:36:27 190858
-+++ gcc-4_7-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
-@@ -15415,7 +15415,10 @@
- }
-
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
- mips_reorg_process_insns ();
- if (!TARGET_MIPS16
- && TARGET_EXPLICIT_RELOCS
---- gcc-4_7-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:27 190858
-+++ gcc-4_7-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859
-@@ -10663,7 +10663,10 @@
- /* We need to have the (essentially) final form of the insn stream in order
- to properly detect the various hazards. Run delay slot scheduling. */
- if (optimize > 0 && flag_delayed_branch)
-- dbr_schedule (get_insns ());
-+ {
-+ cleanup_barriers ();
-+ dbr_schedule (get_insns ());
-+ }
-
- /* Now look for specific patterns in the insn stream. */
- for (insn = get_insns (); insn; insn = next)
-
diff --git a/patches/gcc/4.7.0/001-gcc-bug-54494.patch b/patches/gcc/4.7.0/001-gcc-bug-54494.patch
deleted file mode 100644
index ce4ae77..0000000
--- a/patches/gcc/4.7.0/001-gcc-bug-54494.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=191025
-Log:
-2012-09-06 Andrew Pinski <apinski@cavium.com>
-
- PR tree-opt/54494
- * tree-inline.c (remap_gimple_op_r): Copy TREE_SIDE_EFFECTS also.
-2012-09-06 Andrew Pinski <apinski@cavium.com>
-
- PR tree-opt/54494
- * gcc.dg/tree-ssa/strlen-1.c: New testcase.
-
-
-Added:
- branches/gcc-4_7-branch/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
- - copied unchanged from r191014,
-trunk/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
-Modified:
- branches/gcc-4_7-branch/ (props changed)
- branches/gcc-4_7-branch/gcc/ChangeLog
- branches/gcc-4_7-branch/gcc/testsuite/ChangeLog
- branches/gcc-4_7-branch/gcc/tree-inline.c
-
-Propchange: branches/gcc-4_7-branch/
- ('svn:mergeinfo' modified)
-
----
---- gcc-4_7-branch/gcc/tree-inline.c 2012/09/06 13:47:33 191024
-+++ gcc-4_7-branch/gcc/tree-inline.c 2012/09/06 13:51:37 191025
-@@ -871,6 +871,7 @@
- ptr, TREE_OPERAND (*tp, 1));
- TREE_THIS_NOTRAP (*tp) = TREE_THIS_NOTRAP (old);
- TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
-+ TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old);
- TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old);
- *walk_subtrees = 0;
- return NULL;
-
diff --git a/patches/gcc/4.7.0/100-PR52734-tree-ssa-tail-merge.patch b/patches/gcc/4.7.0/100-PR52734-tree-ssa-tail-merge.patch
deleted file mode 100644
index 5df5431..0000000
--- a/patches/gcc/4.7.0/100-PR52734-tree-ssa-tail-merge.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-------------------------------------------------------------------------
-r186424 | vries | 2012-04-13 18:44:18 +0200 (Fri, 13 Apr 2012) | 12 lines
-
-2012-04-13 Tom de Vries <tom@codesourcery.com>
-
- Backport from mainline r186418.
-
- 2012-04-13 Tom de Vries <tom@codesourcery.com>
-
- * tree-ssa-tail-merge.c (gsi_advance_bw_nondebug_nonlocal): Add
- parameters vuse and vuse_escaped.
- (find_duplicate): Init vuse1, vuse2 and vuse_escaped. Pass to
- gsi_advance_bw_nondebug_nonlocal. Return if vuse_escaped and
- vuse1 != vuse2.
-
-------------------------------------------------------------------------
-Index: gcc/tree-ssa-tail-merge.c
-===================================================================
---- gcc-4.7.0/gcc/tree-ssa-tail-merge.c (revision 186423)
-+++ gcc-4.7.0/gcc/tree-ssa-tail-merge.c (revision 186424)
-@@ -1123,18 +1123,31 @@
- }
- }
-
--/* Let GSI skip backwards over local defs. */
-+/* Let GSI skip backwards over local defs. Return the earliest vuse in VUSE.
-+ Return true in VUSE_ESCAPED if the vuse influenced a SSA_OP_DEF of one of the
-+ processed statements. */
-
- static void
--gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi)
-+gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi, tree *vuse,
-+ bool *vuse_escaped)
- {
- gimple stmt;
-+ tree lvuse;
-
- while (true)
- {
- if (gsi_end_p (*gsi))
- return;
- stmt = gsi_stmt (*gsi);
-+
-+ lvuse = gimple_vuse (stmt);
-+ if (lvuse != NULL_TREE)
-+ {
-+ *vuse = lvuse;
-+ if (!ZERO_SSA_OPERANDS (stmt, SSA_OP_DEF))
-+ *vuse_escaped = true;
-+ }
-+
- if (!(is_gimple_assign (stmt) && local_def (gimple_get_lhs (stmt))
- && !gimple_has_side_effects (stmt)))
- return;
-@@ -1150,9 +1163,11 @@
- {
- gimple_stmt_iterator gsi1 = gsi_last_nondebug_bb (bb1);
- gimple_stmt_iterator gsi2 = gsi_last_nondebug_bb (bb2);
-+ tree vuse1 = NULL_TREE, vuse2 = NULL_TREE;
-+ bool vuse_escaped = false;
-
-- gsi_advance_bw_nondebug_nonlocal (&gsi1);
-- gsi_advance_bw_nondebug_nonlocal (&gsi2);
-+ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
-+ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
-
- while (!gsi_end_p (gsi1) && !gsi_end_p (gsi2))
- {
-@@ -1161,13 +1176,20 @@
-
- gsi_prev_nondebug (&gsi1);
- gsi_prev_nondebug (&gsi2);
-- gsi_advance_bw_nondebug_nonlocal (&gsi1);
-- gsi_advance_bw_nondebug_nonlocal (&gsi2);
-+ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
-+ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
- }
-
- if (!(gsi_end_p (gsi1) && gsi_end_p (gsi2)))
- return;
-
-+ /* If the incoming vuses are not the same, and the vuse escaped into an
-+ SSA_OP_DEF, then merging the 2 blocks will change the value of the def,
-+ which potentially means the semantics of one of the blocks will be changed.
-+ TODO: make this check more precise. */
-+ if (vuse_escaped && vuse1 != vuse2)
-+ return;
-+
- if (dump_file)
- fprintf (dump_file, "find_duplicates: <bb %d> duplicate of <bb %d>\n",
- bb1->index, bb2->index);
diff --git a/patches/gcc/4.7.2/000-libitm-fix-definition-of-__m64.patch b/patches/gcc/4.7.2/000-libitm-fix-definition-of-__m64.patch
deleted file mode 100644
index ade14a7..0000000
--- a/patches/gcc/4.7.2/000-libitm-fix-definition-of-__m64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3d27d47fbebdb1be3d35e398a7c042a930f64aa6 Mon Sep 17 00:00:00 2001
-From: Richard Braun <rbraun@sceen.net>
-Date: Mon, 26 Nov 2012 11:36:17 +0100
-Subject: [PATCH] libitm: fix definition of __m64
-
-See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52695 for details.
----
- libitm/config/x86/target.h | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/libitm/config/x86/target.h b/libitm/config/x86/target.h
-index 5c7e6fb..6254d8a 100644
---- a/libitm/config/x86/target.h
-+++ b/libitm/config/x86/target.h
-@@ -73,6 +73,9 @@ cpu_relax (void)
- /* ??? It's broken for C++. */
- #include <x86intrin.h>
- #else
-+# ifdef __MMX__
-+# include <mmintrin.h>
-+# endif
- # ifdef __SSE2__
- # include <emmintrin.h>
- # elif defined(__SSE__)
---
-1.7.2.5
-
diff --git a/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch b/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch
deleted file mode 100644
index ade14a7..0000000
--- a/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3d27d47fbebdb1be3d35e398a7c042a930f64aa6 Mon Sep 17 00:00:00 2001
-From: Richard Braun <rbraun@sceen.net>
-Date: Mon, 26 Nov 2012 11:36:17 +0100
-Subject: [PATCH] libitm: fix definition of __m64
-
-See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52695 for details.
----
- libitm/config/x86/target.h | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/libitm/config/x86/target.h b/libitm/config/x86/target.h
-index 5c7e6fb..6254d8a 100644
---- a/libitm/config/x86/target.h
-+++ b/libitm/config/x86/target.h
-@@ -73,6 +73,9 @@ cpu_relax (void)
- /* ??? It's broken for C++. */
- #include <x86intrin.h>
- #else
-+# ifdef __MMX__
-+# include <mmintrin.h>
-+# endif
- # ifdef __SSE2__
- # include <emmintrin.h>
- # elif defined(__SSE__)
---
-1.7.2.5
-
diff --git a/patches/gcc/4.7.3/100-fix-PR-target-58595.patch b/patches/gcc/4.7.3/100-fix-PR-target-58595.patch
deleted file mode 100644
index 11b2d5d..0000000
--- a/patches/gcc/4.7.3/100-fix-PR-target-58595.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-commit 4fa1f8926227d4e79975b674dc4292b9bec4b137
-Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu Mar 6 12:07:07 2014 +0000
-
- PR target/58595
- * config/arm/arm.c (arm_tls_symbol_p): Remove.
- (arm_legitimize_address): Call legitimize_tls_address for any
- arm_tls_referenced_p expression, handle constant addend. Call it
- before testing for !TARGET_ARM.
- (thumb_legitimize_address): Don't handle arm_tls_symbol_p here.
-
- * gcc.dg/tls/pr58595.c: New test.
-
-
- git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4
-
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index ce24bfe..af5666b 100644
---- a/gcc/config/arm/arm.c
-+++ b/gcc/config/arm/arm.c
-@@ -235,7 +235,6 @@ static tree arm_gimplify_va_arg_expr (tree, tree, gimple_seq *, gimple_seq *);
- static void arm_option_override (void);
- static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode);
- static bool arm_cannot_copy_insn_p (rtx);
--static bool arm_tls_symbol_p (rtx x);
- static int arm_issue_rate (void);
- static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
- static bool arm_output_addr_const_extra (FILE *, rtx);
-@@ -7336,6 +7335,32 @@ legitimize_tls_address (rtx x, rtx reg)
- rtx
- arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- {
-+ if (arm_tls_referenced_p (x))
-+ {
-+ rtx addend = NULL;
-+
-+ if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS)
-+ {
-+ addend = XEXP (XEXP (x, 0), 1);
-+ x = XEXP (XEXP (x, 0), 0);
-+ }
-+
-+ if (GET_CODE (x) != SYMBOL_REF)
-+ return x;
-+
-+ gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0);
-+
-+ x = legitimize_tls_address (x, NULL_RTX);
-+
-+ if (addend)
-+ {
-+ x = gen_rtx_PLUS (SImode, x, addend);
-+ orig_x = x;
-+ }
-+ else
-+ return x;
-+ }
-+
- if (!TARGET_ARM)
- {
- /* TODO: legitimize_address for Thumb2. */
-@@ -7344,9 +7369,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- return thumb_legitimize_address (x, orig_x, mode);
- }
-
-- if (arm_tls_symbol_p (x))
-- return legitimize_tls_address (x, NULL_RTX);
--
- if (GET_CODE (x) == PLUS)
- {
- rtx xop0 = XEXP (x, 0);
-@@ -7459,9 +7481,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- rtx
- thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- {
-- if (arm_tls_symbol_p (x))
-- return legitimize_tls_address (x, NULL_RTX);
--
- if (GET_CODE (x) == PLUS
- && GET_CODE (XEXP (x, 1)) == CONST_INT
- && (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode)
-@@ -7756,20 +7775,6 @@ thumb_legitimize_reload_address (rtx *x_p,
-
- /* Test for various thread-local symbols. */
-
--/* Return TRUE if X is a thread-local symbol. */
--
--static bool
--arm_tls_symbol_p (rtx x)
--{
-- if (! TARGET_HAVE_TLS)
-- return false;
--
-- if (GET_CODE (x) != SYMBOL_REF)
-- return false;
--
-- return SYMBOL_REF_TLS_MODEL (x) != 0;
--}
--
- /* Helper for arm_tls_referenced_p. */
-
- static int
diff --git a/patches/gcc/4.8.0/001_gcc_4_8_0_backport_patches_to_fix_parallel_build_fail_PR_57683.patch b/patches/gcc/4.8.0/001_gcc_4_8_0_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
deleted file mode 100644
index dc29a7b..0000000
--- a/patches/gcc/4.8.0/001_gcc_4_8_0_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gcc-4.8.2/gcc/Makefile.in 2013-11-22 02:14:33.815230904 +0100
-+++ gcc-4.8.2_patch/gcc/Makefile.in 2013-11-22 02:14:38.391230732 +0100
-@@ -3037,7 +3037,7 @@
- $(TM_H) coretypes.h $(GIMPLE_H) \
- $(TREE_PASS_H) $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) \
- $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) \
-- $(GIMPLE_PRETTY_PRINT_H) langhooks.h
-+ $(GIMPLE_PRETTY_PRINT_H) langhooks.h $(OPTABS_H)
- tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
- $(TM_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \
- tree-iterator.h $(TREE_PASS_H) tree-ssa-propagate.h
-@@ -3276,12 +3276,12 @@
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h insn-codes.h $(DF_H) \
- $(RECOG_H) output.h addresses.h $(REGS_H) hard-reg-set.h $(FLAGS_H) \
- $(FUNCTION_H) $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) \
-- ira.h rtl-error.h $(LRA_INT_H)
-+ ira.h rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-eliminations.o : lra-eliminations.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
- $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) ira.h \
-- rtl-error.h $(LRA_INT_H)
-+ rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-lives.o : lra-lives.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
diff --git a/patches/gcc/4.8.1/001_gcc_4_8_1_backport_patches_to_fix_parallel_build_fail_PR_57683.patch b/patches/gcc/4.8.1/001_gcc_4_8_1_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
deleted file mode 100644
index dc29a7b..0000000
--- a/patches/gcc/4.8.1/001_gcc_4_8_1_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gcc-4.8.2/gcc/Makefile.in 2013-11-22 02:14:33.815230904 +0100
-+++ gcc-4.8.2_patch/gcc/Makefile.in 2013-11-22 02:14:38.391230732 +0100
-@@ -3037,7 +3037,7 @@
- $(TM_H) coretypes.h $(GIMPLE_H) \
- $(TREE_PASS_H) $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) \
- $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) \
-- $(GIMPLE_PRETTY_PRINT_H) langhooks.h
-+ $(GIMPLE_PRETTY_PRINT_H) langhooks.h $(OPTABS_H)
- tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
- $(TM_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \
- tree-iterator.h $(TREE_PASS_H) tree-ssa-propagate.h
-@@ -3276,12 +3276,12 @@
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h insn-codes.h $(DF_H) \
- $(RECOG_H) output.h addresses.h $(REGS_H) hard-reg-set.h $(FLAGS_H) \
- $(FUNCTION_H) $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) \
-- ira.h rtl-error.h $(LRA_INT_H)
-+ ira.h rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-eliminations.o : lra-eliminations.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
- $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) ira.h \
-- rtl-error.h $(LRA_INT_H)
-+ rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-lives.o : lra-lives.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
diff --git a/patches/gcc/4.8.2/001_gcc_4_8_2_backport_patches_to_fix_parallel_build_fail_PR_57683.patch b/patches/gcc/4.8.2/001_gcc_4_8_2_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
deleted file mode 100644
index dc29a7b..0000000
--- a/patches/gcc/4.8.2/001_gcc_4_8_2_backport_patches_to_fix_parallel_build_fail_PR_57683.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gcc-4.8.2/gcc/Makefile.in 2013-11-22 02:14:33.815230904 +0100
-+++ gcc-4.8.2_patch/gcc/Makefile.in 2013-11-22 02:14:38.391230732 +0100
-@@ -3037,7 +3037,7 @@
- $(TM_H) coretypes.h $(GIMPLE_H) \
- $(TREE_PASS_H) $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) \
- $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) \
-- $(GIMPLE_PRETTY_PRINT_H) langhooks.h
-+ $(GIMPLE_PRETTY_PRINT_H) langhooks.h $(OPTABS_H)
- tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
- $(TM_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \
- tree-iterator.h $(TREE_PASS_H) tree-ssa-propagate.h
-@@ -3276,12 +3276,12 @@
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h insn-codes.h $(DF_H) \
- $(RECOG_H) output.h addresses.h $(REGS_H) hard-reg-set.h $(FLAGS_H) \
- $(FUNCTION_H) $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) \
-- ira.h rtl-error.h $(LRA_INT_H)
-+ ira.h rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-eliminations.o : lra-eliminations.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
- $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) ira.h \
-- rtl-error.h $(LRA_INT_H)
-+ rtl-error.h $(LRA_INT_H) $(OPTABS_H)
- lra-lives.o : lra-lives.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
- $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
diff --git a/patches/gcc/4.8.2/100-arm_expand_epilogue_apcs_frame-emit-blockage.patch b/patches/gcc/4.8.2/100-arm_expand_epilogue_apcs_frame-emit-blockage.patch
deleted file mode 100644
index 333438d..0000000
--- a/patches/gcc/4.8.2/100-arm_expand_epilogue_apcs_frame-emit-blockage.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 9a228f68817f79bbd1d295b8e6fcaed25c47ee8f
-Author: ramana <ramana@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed Oct 30 10:54:04 2013 +0000
-
- Fix PR target/58854
-
- 2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-
- PR target/58854
- * config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage.
-
-
- git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204203 138bc75d-0d04-0410-961f-82ee72b054a4
-
-[yann.morin.1998@free.fr: removed the patch to the Changelog, it does not
- apply and we don't really need it; re-diff to avoid offsets]
-
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 212a4bc..23dfc0e 100644
---- a/gcc/config/arm/arm.c
-+++ b/gcc/config/arm/arm.c
-@@ -23555,6 +23555,7 @@ arm_expand_epilogue_apcs_frame (bool really_return)
- num_regs = bit_count (saved_regs_mask);
- if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca)
- {
-+ emit_insn (gen_blockage ());
- /* Unwind the stack to just below the saved registers. */
- emit_insn (gen_addsi3 (stack_pointer_rtx,
- hard_frame_pointer_rtx,
diff --git a/patches/gcc/4.8.2/110-fix-PR-target-58595.patch b/patches/gcc/4.8.2/110-fix-PR-target-58595.patch
deleted file mode 100644
index 62a3994..0000000
--- a/patches/gcc/4.8.2/110-fix-PR-target-58595.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Backport fix for PR target/58595
-
-From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 6 Mar 2014 12:07:07 +0000
-Subject: [PATCH] PR target/58595 * config/arm/arm.c
- (arm_tls_symbol_p): Remove. (arm_legitimize_address): Call
- legitimize_tls_address for any arm_tls_referenced_p expression,
- handle constant addend. Call it before testing for !TARGET_ARM.
- (thumb_legitimize_address): Don't handle arm_tls_symbol_p here.
-
- * gcc.dg/tls/pr58595.c: New test.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Index: gcc-4.8.2/gcc/config/arm/arm.c
-===================================================================
---- gcc-4.8.2.orig/gcc/config/arm/arm.c
-+++ gcc-4.8.2/gcc/config/arm/arm.c
-@@ -230,7 +230,6 @@ static tree arm_gimplify_va_arg_expr (tr
- static void arm_option_override (void);
- static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode);
- static bool arm_cannot_copy_insn_p (rtx);
--static bool arm_tls_symbol_p (rtx x);
- static int arm_issue_rate (void);
- static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
- static bool arm_output_addr_const_extra (FILE *, rtx);
-@@ -6573,6 +6572,32 @@ legitimize_tls_address (rtx x, rtx reg)
- rtx
- arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- {
-+ if (arm_tls_referenced_p (x))
-+ {
-+ rtx addend = NULL;
-+
-+ if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS)
-+ {
-+ addend = XEXP (XEXP (x, 0), 1);
-+ x = XEXP (XEXP (x, 0), 0);
-+ }
-+
-+ if (GET_CODE (x) != SYMBOL_REF)
-+ return x;
-+
-+ gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0);
-+
-+ x = legitimize_tls_address (x, NULL_RTX);
-+
-+ if (addend)
-+ {
-+ x = gen_rtx_PLUS (SImode, x, addend);
-+ orig_x = x;
-+ }
-+ else
-+ return x;
-+ }
-+
- if (!TARGET_ARM)
- {
- /* TODO: legitimize_address for Thumb2. */
-@@ -6581,9 +6606,6 @@ arm_legitimize_address (rtx x, rtx orig_
- return thumb_legitimize_address (x, orig_x, mode);
- }
-
-- if (arm_tls_symbol_p (x))
-- return legitimize_tls_address (x, NULL_RTX);
--
- if (GET_CODE (x) == PLUS)
- {
- rtx xop0 = XEXP (x, 0);
-@@ -6695,9 +6717,6 @@ arm_legitimize_address (rtx x, rtx orig_
- rtx
- thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
- {
-- if (arm_tls_symbol_p (x))
-- return legitimize_tls_address (x, NULL_RTX);
--
- if (GET_CODE (x) == PLUS
- && CONST_INT_P (XEXP (x, 1))
- && (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode)
-@@ -6988,20 +7007,6 @@ thumb_legitimize_reload_address (rtx *x_
-
- /* Test for various thread-local symbols. */
-
--/* Return TRUE if X is a thread-local symbol. */
--
--static bool
--arm_tls_symbol_p (rtx x)
--{
-- if (! TARGET_HAVE_TLS)
-- return false;
--
-- if (GET_CODE (x) != SYMBOL_REF)
-- return false;
--
-- return SYMBOL_REF_TLS_MODEL (x) != 0;
--}
--
- /* Helper for arm_tls_referenced_p. */
-
- static int
diff --git a/patches/gcc/5.1.0/100-libitm-fixes-for-musl-support.patch b/patches/gcc/5.1.0/100-libitm-fixes-for-musl-support.patch
deleted file mode 100644
index 96a724b..0000000
--- a/patches/gcc/5.1.0/100-libitm-fixes-for-musl-support.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000)
-Subject: libitm fixes for musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338
-
-libitm fixes for musl support
-
-On behalf of Szabolcs.Nagy@arm.com
-
-2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca>
-
- * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h.
- * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
-index a1c2cfd..ea8f023 100644
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0
-
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <elf.h>
-
- static void __attribute__((constructor))
-diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
-index e731ab7..54ad8b6 100644
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
- GLIBC has reserved words 10 through 13 for TM. */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
-
- #include "config/generic/tls.h"
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
-
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
-
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
-
- #endif // LIBITM_X86_TLS_H
diff --git a/patches/gcc/5.1.0/101-fixincludes-update-for-musl-support.patch b/patches/gcc/5.1.0/101-fixincludes-update-for-musl-support.patch
deleted file mode 100644
index 6bc3f54..0000000
--- a/patches/gcc/5.1.0/101-fixincludes-update-for-musl-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:18:16 +0000 (+0000)
-Subject: fixincludes update for musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2dc727de2e87c2756a514cbb43cea23c99deaa3d
-
-fixincludes update for musl support
-
-On behalf of Szabolcs.Nagy@arm.com
-
-2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca>
-
- * mkfixinc.sh: Add *-musl* with no fixes.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
-index 6653fed..0d96c8c 100755
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@ case $machine in
- powerpc-*-eabi* | \
- powerpc-*-rtems* | \
- powerpcle-*-eabisim* | \
-- powerpcle-*-eabi* )
-+ powerpcle-*-eabi* | \
-+ *-musl* )
- # IF there is no include fixing,
- # THEN create a no-op fixer and exit
- (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/patches/gcc/5.1.0/102-unwind-fix-for-musl.patch b/patches/gcc/5.1.0/102-unwind-fix-for-musl.patch
deleted file mode 100644
index 6db0e6f..0000000
--- a/patches/gcc/5.1.0/102-unwind-fix-for-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000)
-Subject: unwind fix for musl
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4
-
-unwind fix for musl
-
-On behalf of szabolcs.nagy@arm.com
-
-2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca>
- Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on
- Linux if target provides dl_iterate_phdr.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index e1e566b..137dced 100644
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
-
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- && defined(TARGET_DL_ITERATE_PHDR) \
-+ && defined(__linux__)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+ && defined(TARGET_DL_ITERATE_PHDR) \
- && (defined(__DragonFly__) || defined(__FreeBSD__))
- # define ElfW __ElfN
- # define USE_PT_GNU_EH_FRAME
diff --git a/patches/gcc/5.1.0/103-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/patches/gcc/5.1.0/103-libstdc++-libgfortran-gthr-workaround-for-musl.patch
deleted file mode 100644
index df1d321..0000000
--- a/patches/gcc/5.1.0/103-libstdc++-libgfortran-gthr-workaround-for-musl.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:24:11 +0000 (+0000)
-Subject: libstdc++, libgfortran gthr workaround for musl
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=1e5f711c11cb80ce609db9e9c1d8b2da0f7b5b61
-
-libstdc++, libgfortran gthr workaround for musl
-
-On behalf of szabolcs.nagy@arm.com
-
-[libstdc++-v3/]
-2015-04-22 Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * config/os/generic/os_defines.h (_GLIBCXX_GTHREAD_USE_WEAK): Define.
- * configure.host (os_include_dir): Set to "os/generic" for linux-musl*.
-
-[libgfortran/]
-2015-04-22 Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * acinclude.m4 (GTHREAD_USE_WEAK): Define as 0 for *-*-musl*.
- * configure: Regenerate.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
-index ba890f9..30b8b1a6 100644
---- a/libgfortran/acinclude.m4
-+++ b/libgfortran/acinclude.m4
-@@ -100,7 +100,7 @@ void foo (void);
- [Define to 1 if the target supports #pragma weak])
- fi
- case "$host" in
-- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
-+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
- AC_DEFINE(GTHREAD_USE_WEAK, 0,
- [Define to 0 if the target shouldn't use #pragma weak])
- ;;
-diff --git a/libgfortran/configure b/libgfortran/configure
-index e1592f7..07542e1 100755
---- a/libgfortran/configure
-+++ b/libgfortran/configure
-@@ -26447,7 +26447,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>confdefs.h
-
- fi
- case "$host" in
-- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
-+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
-
- $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
-
-diff --git a/libstdc++-v3/config/os/generic/os_defines.h b/libstdc++-v3/config/os/generic/os_defines.h
-index 45bf52a..103ec0e 100644
---- a/libstdc++-v3/config/os/generic/os_defines.h
-+++ b/libstdc++-v3/config/os/generic/os_defines.h
-@@ -33,4 +33,9 @@
- // System-specific #define, typedefs, corrections, etc, go here. This
- // file will come before all others.
-
-+// Disable the weak reference logic in gthr.h for os/generic because it
-+// is broken on every platform unless there is implementation specific
-+// workaround in gthr-posix.h and at link-time for static linking.
-+#define _GLIBCXX_GTHREAD_USE_WEAK 0
-+
- #endif
-diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
-index 82ddc52..a349ce3 100644
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -271,6 +271,9 @@ case "${host_os}" in
- freebsd*)
- os_include_dir="os/bsd/freebsd"
- ;;
-+ linux-musl*)
-+ os_include_dir="os/generic"
-+ ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
- if [ "$uclibc" = "yes" ]; then
- os_include_dir="os/uclibc"
diff --git a/patches/gcc/5.1.0/104-musl-libc-config.patch b/patches/gcc/5.1.0/104-musl-libc-config.patch
deleted file mode 100644
index 7020a3d..0000000
--- a/patches/gcc/5.1.0/104-musl-libc-config.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 08:25:47 +0000 (+0000)
-Subject: [PATCH 2/13] musl libc config
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29c16f8ef226fbf98af373a4b2ceb
-
-[PATCH 2/13] musl libc config
-
-2015-05-08 Gregor Richards <gregor.richards@uwaterloo.ca>
- Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * config.gcc (LIBC_MUSL): New tm_defines macro.
- * config/linux.h (OPTION_MUSL): Define.
- (MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,)
- (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,)
- (INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,)
- (INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,)
- (INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define.
- * config/linux.opt (mmusl): New option.
- * doc/invoke.texi (GNU/Linux Options): Document -mmusl.
- * configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*.
- (gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*.
- * configure: Regenerate.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 938d619..e993e5d 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -575,7 +575,7 @@ case ${target} in
- esac
-
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
-
- # 32-bit x86 processors supported by --with-arch=. Each processor
- # MUST be separated by exactly one space.
-@@ -728,6 +728,9 @@ case ${target} in
- *-*-*uclibc*)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
- ;;
-+ *-*-*musl*)
-+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+ ;;
- *)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
- ;;
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 857389a..b551c56 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
-@@ -50,21 +52,25 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- } while (0)
-
- /* Determine which dynamic linker to use depending on whether GLIBC or
-- uClibc or Bionic is the default C library and whether
-- -muclibc or -mglibc or -mbionic has been passed to change the default. */
-+ uClibc or Bionic or musl is the default C library and whether
-+ -muclibc or -mglibc or -mbionic or -mmusl has been passed to change
-+ the default. */
-
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
-- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
-+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
-
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -81,24 +87,100 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
-+/* Should be redefined for each target that supports musl. */
-+#define MUSL_DYNAMIC_LINKER "/dev/null"
-+#define MUSL_DYNAMIC_LINKER32 "/dev/null"
-+#define MUSL_DYNAMIC_LINKER64 "/dev/null"
-+#define MUSL_DYNAMIC_LINKERX32 "/dev/null"
-
- #define GNU_USER_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
-- BIONIC_DYNAMIC_LINKER)
-+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
-- BIONIC_DYNAMIC_LINKER32)
-+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
-- BIONIC_DYNAMIC_LINKER64)
-+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
-- BIONIC_DYNAMIC_LINKERX32)
-+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
-
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP \
-+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
-+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
-+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
-+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL \
-+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
-+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX \
-+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS \
-+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL \
-+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE \
-+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
-+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS \
-+ { \
-+ INCLUDE_DEFAULTS_MUSL_GPP \
-+ INCLUDE_DEFAULTS_MUSL_PREFIX \
-+ INCLUDE_DEFAULTS_MUSL_CROSS \
-+ INCLUDE_DEFAULTS_MUSL_TOOL \
-+ INCLUDE_DEFAULTS_MUSL_NATIVE \
-+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
-+ { 0, 0, 0, 0, 0, 0 } \
-+ }
-+#endif
-+
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target. We don't define below macros to normal linux
- versions, because doing so would require *uclinux* targets to include
-diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
-index c054338..ef055a7 100644
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
- Use GNU C library
-
- muclibc
--Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
-+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
-+Use musl C library
-diff --git a/gcc/configure b/gcc/configure
-index e563e94..b99eb6d 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -27740,6 +27740,9 @@ if test "${gcc_cv_libc_provides_ssp+set}" = set; then :
- else
- gcc_cv_libc_provides_ssp=no
- case "$target" in
-+ *-*-musl*)
-+ # All versions of musl provide stack protector
-+ gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # glibc 2.4 and later provides __stack_chk_fail and
- # either __stack_chk_guard, or TLS access to stack guard canary.
-@@ -27772,6 +27775,7 @@ fi
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- # realistically usable GNU/Hurd configurations.
-+ # All supported versions of musl provide it as well
- gcc_cv_libc_provides_ssp=yes;;
- *-*-darwin* | *-*-freebsd*)
- ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
-@@ -27868,6 +27872,9 @@ case "$target" in
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
-+ *-linux-musl*)
-+ gcc_cv_target_dl_iterate_phdr=yes
-+ ;;
- esac
-
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 55fe633..810725c 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5247,6 +5247,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
- gcc_cv_libc_provides_ssp,
- [gcc_cv_libc_provides_ssp=no
- case "$target" in
-+ *-*-musl*)
-+ # All versions of musl provide stack protector
-+ gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # glibc 2.4 and later provides __stack_chk_fail and
- # either __stack_chk_guard, or TLS access to stack guard canary.
-@@ -5273,6 +5276,7 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- # realistically usable GNU/Hurd configurations.
-+ # All supported versions of musl provide it as well
- gcc_cv_libc_provides_ssp=yes;;
- *-*-darwin* | *-*-freebsd*)
- AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
-@@ -5346,6 +5350,9 @@ case "$target" in
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
-+ *-linux-musl*)
-+ gcc_cv_target_dl_iterate_phdr=yes
-+ ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index cb5ae17..9169731 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -669,7 +669,7 @@ Objective-C and Objective-C++ Dialects}.
- -mcpu=@var{cpu}}
-
- @emph{GNU/Linux Options}
--@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol
-+@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol
- -tno-android-cc -tno-android-ld}
-
- @emph{H8/300 Options}
-@@ -15384,13 +15384,19 @@ These @samp{-m} options are defined for GNU/Linux targets:
- @item -mglibc
- @opindex mglibc
- Use the GNU C library. This is the default except
--on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets.
-+on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and
-+@samp{*-*-linux-*android*} targets.
-
- @item -muclibc
- @opindex muclibc
- Use uClibc C library. This is the default on
- @samp{*-*-linux-*uclibc*} targets.
-
-+@item -mmusl
-+@opindex mmusl
-+Use the musl C library. This is the default on
-+@samp{*-*-linux-*musl*} targets.
-+
- @item -mbionic
- @opindex mbionic
- Use Bionic C library. This is the default on
diff --git a/patches/gcc/5.1.0/105-add-musl-support-to-gcc.patch b/patches/gcc/5.1.0/105-add-musl-support-to-gcc.patch
deleted file mode 100644
index a1c3e08..0000000
--- a/patches/gcc/5.1.0/105-add-musl-support-to-gcc.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 08:30:40 +0000 (+0000)
-Subject: [PATCH 0/13] Add musl support to GCC
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e
-
-[PATCH 0/13] Add musl support to GCC
-
-2015-05-08 Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * config/glibc-stdint.h (OPTION_MUSL): Define.
- (INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE):
- Change the definition based on OPTION_MUSL for 64 bit targets.
- * config/linux.h (OPTION_MUSL): Redefine.
- * config/alpha/linux.h (OPTION_MUSL): Redefine.
- * config/rs6000/linux.h (OPTION_MUSL): Redefine.
- * config/rs6000/linux64.h (OPTION_MUSL): Redefine.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
-index c567f43..475ea06 100644
---- a/gcc/config/alpha/linux.h
-+++ b/gcc/config/alpha/linux.h
-@@ -61,10 +61,14 @@ along with GCC; see the file COPYING3. If not see
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- /* Determine what functions are present at the runtime;
-diff --git a/gcc/config/glibc-stdint.h b/gcc/config/glibc-stdint.h
-index 3fc67dc..98f4f04 100644
---- a/gcc/config/glibc-stdint.h
-+++ b/gcc/config/glibc-stdint.h
-@@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Exception along with this program;
- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- <http://www.gnu.org/licenses/>. */
-
-+/* Systems using musl libc should use this header and make sure
-+ OPTION_MUSL is defined correctly before using the TYPE macros. */
-+#ifndef OPTION_MUSL
-+#define OPTION_MUSL 0
-+#endif
-+
- #define SIG_ATOMIC_TYPE "int"
-
- #define INT8_TYPE "signed char"
-@@ -43,12 +49,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
-
- #define INT_FAST8_TYPE "signed char"
--#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
--#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
-+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
- #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
- #define UINT_FAST8_TYPE "unsigned char"
--#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
--#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
-+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
-+#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
- #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
-
- #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index b551c56..7bc87ab 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,11 +32,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
- #define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
- #define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
-diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
-index fe0ebd6..a68ff69 100644
---- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -30,10 +30,14 @@
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- /* Determine what functions are present at the runtime;
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 0879e7e..1b7f695 100644
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -299,10 +299,14 @@ extern int dot_symbols;
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- /* Determine what functions are present at the runtime;
diff --git a/patches/gcc/5.1.0/106-mips-musl-support.patch b/patches/gcc/5.1.0/106-mips-musl-support.patch
deleted file mode 100644
index 60a5ac0..0000000
--- a/patches/gcc/5.1.0/106-mips-musl-support.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 15:16:50 +0000 (+0000)
-Subject: [PATCH 6/13] mips musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c887472b587bef87d433c51cf1ebc8
-
-[PATCH 6/13] mips musl support
-
-2015-05-08 Gregor Richards <gregor.richards@uwaterloo.ca>
- Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Define.
- (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Define.
- (GNU_USER_DYNAMIC_LINKERN32): Update.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
-index 91df261..fb358e2 100644
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -37,7 +37,13 @@ along with GCC; see the file COPYING3. If not see
- #define UCLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
-
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
-+
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
-- BIONIC_DYNAMIC_LINKERN32)
-+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
-
diff --git a/patches/gcc/5.1.0/107-x86-musl-support.patch b/patches/gcc/5.1.0/107-x86-musl-support.patch
deleted file mode 100644
index 1ab6c44..0000000
--- a/patches/gcc/5.1.0/107-x86-musl-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 15 May 2015 13:20:01 +0000 (+0000)
-Subject: [PATCH 9/13] x86 musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c
-
-[PATCH 9/13] x86 musl support
-
-On behalf of Szabolcs Nagy.
-
-2015-05-15 Gregor Richards <gregor.richards@uwaterloo.ca>
-
- * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define.
- * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
- (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
-index a100963..385aefd 100644
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,6 @@ along with GCC; see the file COPYING3. If not see
-
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
-index a27d3be..e300480 100644
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
diff --git a/patches/gcc/5.1.0/108-arm-musl-support.patch b/patches/gcc/5.1.0/108-arm-musl-support.patch
deleted file mode 100644
index 34b348f..0000000
--- a/patches/gcc/5.1.0/108-arm-musl-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 27 May 2015 13:17:11 +0000 (+0000)
-Subject: [PATCH 4/13] arm musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=de799bd087ab9a179768fea75bd195a31d3432a4
-
-[PATCH 4/13] arm musl support
-
-On behalf of szabolcs.nagy@arm.com
-
-2015-05-27 Gregor Richards <gregor.richards@uwaterloo.ca>
-
- * config/arm/linux-eabi.h (MUSL_DYNAMIC_LINKER): Define.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index 2cf3ca7..d51376f 100644
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
- %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
- %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
-
-+/* For ARM musl currently supports four dynamic linkers:
-+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+ musl does not support the legacy OABI mode.
-+ All the dynamic linkers live in /lib.
-+ We default to soft-float, EL. */
-+#undef MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
- use the GNU/Linux version, not the generic BPABI version. */
- #undef LINK_SPEC
diff --git a/patches/gcc/5.1.0/109-aarch64-musl-support.patch b/patches/gcc/5.1.0/109-aarch64-musl-support.patch
deleted file mode 100644
index d6a95ca..0000000
--- a/patches/gcc/5.1.0/109-aarch64-musl-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: jgreenhalgh <jgreenhalgh@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 27 May 2015 16:46:39 +0000 (+0000)
-Subject: [PATCH 3/13] aarch64 musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=b3ff21cf0531be91bc3fb8200296a7633090ec78
-
-[PATCH 3/13] aarch64 musl support
-
-gcc/Changelog:
-
-2015-05-27 Gregor Richards <gregor.richards@uwaterloo.ca>
- Szabolcs Nagy <szabolcs.nagy@arm.com>
-
- * config/aarch64/aarch64-linux.h (MUSL_DYNAMIC_LINKER): Define.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index ba7fc3b..1600a32 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -23,6 +23,9 @@
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+
- #undef ASAN_CC1_SPEC
- #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
-
diff --git a/patches/newlib/1.17.0/100-avr32.patch b/patches/newlib/1.17.0/100-avr32.patch
deleted file mode 100644
index 7e0520c..0000000
--- a/patches/newlib/1.17.0/100-avr32.patch
+++ /dev/null
@@ -1,32450 +0,0 @@
-diff -Naur newlib-1.17.0/COPYING.LIBGLOSS newlib-1.17.0-new/COPYING.LIBGLOSS
---- newlib-1.17.0/COPYING.LIBGLOSS 2008-12-18 00:16:07.000000000 +0100
-+++ newlib-1.17.0-new/COPYING.LIBGLOSS 2009-05-22 09:57:49.000000000 +0200
-@@ -228,3 +228,33 @@
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-+
-+(13) Atmel Corporation (avr32 targets only)
-+Copyright (c) 2006, Atmel Corporation All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+
-+1. Redistributions of source code must retain the above copyright notice,
-+this list of conditions and the following disclaimer.
-+
-+2. Redistributions in binary form must reproduce the above copyright notice,
-+this list of conditions and the following disclaimer in the documentation
-+and/or other materials provided with the distribution.
-+
-+3. The name of ATMEL may not be used to endorse or promote products
-+derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY ATMEL ``AS IS'' AND ANY EXPRESS
-+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+PARTICULAR PURPOSE ARE EXPRESSLY AND SPECIFICALLY
-+DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT,
-+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-diff -Naur newlib-1.17.0/COPYING.NEWLIB newlib-1.17.0-new/COPYING.NEWLIB
---- newlib-1.17.0/COPYING.NEWLIB 2008-12-18 00:16:07.000000000 +0100
-+++ newlib-1.17.0-new/COPYING.NEWLIB 2009-05-22 09:57:49.000000000 +0200
-@@ -767,3 +767,33 @@
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-+
-+(35) Atmel Corporation (avr32 targets only)
-+Copyright (c) 2006, Atmel Corporation All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+
-+1. Redistributions of source code must retain the above copyright notice,
-+this list of conditions and the following disclaimer.
-+
-+2. Redistributions in binary form must reproduce the above copyright notice,
-+this list of conditions and the following disclaimer in the documentation
-+and/or other materials provided with the distribution.
-+
-+3. The name of ATMEL may not be used to endorse or promote products
-+derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY ATMEL ``AS IS'' AND ANY EXPRESS
-+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+PARTICULAR PURPOSE ARE EXPRESSLY AND SPECIFICALLY
-+DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT,
-+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-diff -Naur newlib-1.17.0/newlib/configure.host newlib-1.17.0-new/newlib/configure.host
---- newlib-1.17.0/newlib/configure.host 2008-12-18 00:09:09.000000000 +0100
-+++ newlib-1.17.0-new/newlib/configure.host 2009-05-22 09:57:49.000000000 +0200
-@@ -99,6 +99,10 @@
- arm)
- machine_dir=arm
- ;;
-+ avr32*)
-+ machine_dir=avr32
-+ newlib_cflags="${newlib_cflags} -ffunction-sections"
-+ ;;
- avr*)
- newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -mcall-prologues"
- ;;
-@@ -365,6 +369,9 @@
- crx*)
- sys_dir=
- ;;
-+ avr32-*-*)
-+ sys_dir=avr32
-+ ;;
- d10v*)
- sys_dir=d10v
- ;;
-@@ -575,6 +582,10 @@
- arc*)
- newlib_cflags="${newlib_cflags} -DREENTRANT_SYSCALLS_PROVIDED"
- ;;
-+ avr32*)
-+ syscall_dir=syscalls
-+ newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM"
-+ ;;
- avr*)
- newlib_cflags="${newlib_cflags} -DNO_EXEC -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
- ;;
-diff -Naur newlib-1.17.0/newlib/libc/include/machine/ieeefp.h newlib-1.17.0-new/newlib/libc/include/machine/ieeefp.h
---- newlib-1.17.0/newlib/libc/include/machine/ieeefp.h 2008-12-11 21:05:38.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/include/machine/ieeefp.h 2009-05-22 09:57:49.000000000 +0200
-@@ -275,6 +275,10 @@
- #define _DOUBLE_IS_32BITS
- #endif
-
-+#ifdef __AVR32__
-+#define __IEEE_BIG_ENDIAN
-+#endif
-+
- #if defined(__or32__) || defined(__or1k__) || defined(__or16__)
- #define __IEEE_BIG_ENDIAN
- #endif
-diff -Naur newlib-1.17.0/newlib/libc/include/machine/setjmp.h newlib-1.17.0-new/newlib/libc/include/machine/setjmp.h
---- newlib-1.17.0/newlib/libc/include/machine/setjmp.h 2008-12-11 21:05:38.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/include/machine/setjmp.h 2009-05-22 09:57:49.000000000 +0200
-@@ -13,6 +13,13 @@
- #define _JBLEN 24
- #endif
-
-+#if defined(__AVR32__)
-+/*
-+ r0-r7, lr, sp
-+ */
-+#define _JBLEN 10
-+#endif
-+
- #ifdef __sparc__
- /*
- * onsstack,sigmask,sp,pc,npc,psr,g1,o0,wbcnt (sigcontext).
-diff -Naur newlib-1.17.0/newlib/libc/include/machine/time.h newlib-1.17.0-new/newlib/libc/include/machine/time.h
---- newlib-1.17.0/newlib/libc/include/machine/time.h 2000-12-04 20:06:37.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/include/machine/time.h 2009-05-22 09:57:49.000000000 +0200
-@@ -6,6 +6,10 @@
- #else /* !__rtems__ */
- #if defined(__arm__) || defined(__thumb__)
- #define _CLOCKS_PER_SEC_ 100
-+#else
-+#if defined(__AVR32__)
-+#define _CLOCKS_PER_SEC_ 1000000
-+#endif
- #endif
- #endif /* !__rtems__ */
-
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/aclocal.m4 newlib-1.17.0-new/newlib/libc/machine/avr32/aclocal.m4
---- newlib-1.17.0/newlib/libc/machine/avr32/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/aclocal.m4 2009-05-22 09:57:49.000000000 +0200
-@@ -0,0 +1,382 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+dnl This provides configure definitions used by all the newlib
-+dnl configure.in files.
-+
-+dnl Basic newlib configury. This calls basic introductory stuff,
-+dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST. It also runs
-+dnl configure.host. The only argument is the relative path to the top
-+dnl newlib directory.
-+
-+AC_DEFUN(NEWLIB_CONFIGURE,
-+[
-+dnl Default to --enable-multilib
-+AC_ARG_ENABLE(multilib,
-+[ --enable-multilib build many library versions (default)],
-+[case "${enableval}" in
-+ yes) multilib=yes ;;
-+ no) multilib=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
-+ esac], [multilib=yes])dnl
-+
-+dnl Support --enable-target-optspace
-+AC_ARG_ENABLE(target-optspace,
-+[ --enable-target-optspace optimize for space],
-+[case "${enableval}" in
-+ yes) target_optspace=yes ;;
-+ no) target_optspace=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
-+ esac], [target_optspace=])dnl
-+
-+dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-+AC_ARG_ENABLE(malloc-debugging,
-+[ --enable-malloc-debugging indicate malloc debugging requested],
-+[case "${enableval}" in
-+ yes) malloc_debugging=yes ;;
-+ no) malloc_debugging=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
-+ esac], [malloc_debugging=])dnl
-+
-+dnl Support --enable-newlib-mb
-+AC_ARG_ENABLE(newlib-mb,
-+[ --enable-newlib-mb enable multibyte support],
-+[case "${enableval}" in
-+ yes) newlib_mb=yes ;;
-+ no) newlib_mb=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
-+ esac], [newlib_mb=])dnl
-+
-+dnl Support --enable-newlib-iconv
-+AC_ARG_ENABLE(newlib-iconv,
-+[ --enable-newlib-iconv enable iconv library support],
-+[case "${enableval}" in
-+ yes) newlib_iconv=yes ;;
-+ no) newlib_iconv=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-+ esac], [newlib_iconv=])dnl
-+
-+dnl Support --enable-newlib-builtin-converters
-+AC_ARG_ENABLE(newlib-builtin-converters,
-+[ --enable-newlib-builtin-converters enable specific comma-separated list of iconv converters to be built-in],
-+[if test x${enableval} = x; then
-+ AC_MSG_ERROR(bad value ${enableval} for newlib-builtin-converters option - use comma-separated list)
-+ fi
-+ builtin_converters=${enableval}
-+ ], [builtin_converters=])dnl
-+
-+dnl Support --enable-newlib-multithread
-+AC_ARG_ENABLE(newlib-multithread,
-+[ --enable-newlib-multithread enable support for multiple threads],
-+[case "${enableval}" in
-+ yes) newlib_multithread=yes ;;
-+ no) newlib_multithread=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
-+ esac], [newlib_multithread=yes])dnl
-+
-+dnl Support --enable-newlib-elix-level
-+AC_ARG_ENABLE(newlib-elix-level,
-+[ --enable-newlib-elix-level supply desired elix library level (1-4)],
-+[case "${enableval}" in
-+ 0) newlib_elix_level=0 ;;
-+ 1) newlib_elix_level=1 ;;
-+ 2) newlib_elix_level=2 ;;
-+ 3) newlib_elix_level=3 ;;
-+ 4) newlib_elix_level=4 ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
-+ esac], [newlib_elix_level=0])dnl
-+
-+dnl Support --disable-newlib-io-float
-+AC_ARG_ENABLE(newlib-io-float,
-+[ --disable-newlib-io-float disable printf/scanf family float support],
-+[case "${enableval}" in
-+ yes) newlib_io_float=yes ;;
-+ no) newlib_io_float=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
-+ esac], [newlib_io_float=yes])dnl
-+
-+dnl Support --disable-newlib-supplied-syscalls
-+AC_ARG_ENABLE(newlib-supplied-syscalls,
-+[ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-+[case "${enableval}" in
-+ yes) newlib_may_supply_syscalls=yes ;;
-+ no) newlib_may_supply_syscalls=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
-+ esac], [newlib_may_supply_syscalls=yes])dnl
-+
-+AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-+
-+dnl We may get other options which we don't document:
-+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-+
-+test -z "[$]{with_target_subdir}" && with_target_subdir=.
-+
-+if test "[$]{srcdir}" = "."; then
-+ if test "[$]{with_target_subdir}" != "."; then
-+ newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-+ else
-+ newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-+ fi
-+else
-+ newlib_basedir="[$]{srcdir}/$1"
-+fi
-+AC_SUBST(newlib_basedir)
-+
-+AC_CANONICAL_SYSTEM
-+
-+AM_INIT_AUTOMAKE(newlib, 1.12.0)
-+
-+# FIXME: We temporarily define our own version of AC_PROG_CC. This is
-+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
-+# are probably using a cross compiler, which will not be able to fully
-+# link an executable. This should really be fixed in autoconf
-+# itself.
-+
-+AC_DEFUN(LIB_AC_PROG_CC,
-+[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-+AC_CHECK_PROG(CC, gcc, gcc)
-+if test -z "$CC"; then
-+ AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-+fi
-+
-+AC_PROG_CC_GNU
-+
-+if test $ac_cv_prog_gcc = yes; then
-+ GCC=yes
-+dnl Check whether -g works, even if CFLAGS is set, in case the package
-+dnl plays around with CFLAGS (such as to build both debugging and
-+dnl normal versions of a library), tasteless as that idea is.
-+ ac_test_CFLAGS="${CFLAGS+set}"
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+ AC_PROG_CC_G
-+ if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+ elif test $ac_cv_prog_cc_g = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-O2"
-+ fi
-+else
-+ GCC=
-+ test "${CFLAGS+set}" = set || CFLAGS="-g"
-+fi
-+])
-+
-+LIB_AC_PROG_CC
-+
-+AC_CHECK_TOOL(AS, as)
-+AC_CHECK_TOOL(AR, ar)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+
-+AC_PROG_INSTALL
-+
-+AM_MAINTAINER_MODE
-+
-+# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-+# at least currently, we never actually build a program, so we never
-+# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-+# fails, because we are probably configuring with a cross compiler
-+# which can't create executables. So we include AC_EXEEXT to keep
-+# automake happy, but we don't execute it, since we don't care about
-+# the result.
-+if false; then
-+ AC_EXEEXT
-+fi
-+
-+. [$]{newlib_basedir}/configure.host
-+
-+newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-+
-+NEWLIB_CFLAGS=${newlib_cflags}
-+AC_SUBST(NEWLIB_CFLAGS)
-+
-+LDFLAGS=${ldflags}
-+AC_SUBST(LDFLAGS)
-+
-+AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-+AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-+AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-+AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-+AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-+
-+AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-+
-+# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we
-+# use oext, which is set in configure.host based on the target platform.
-+OBJEXT=${oext}
-+
-+AC_SUBST(OBJEXT)
-+AC_SUBST(oext)
-+AC_SUBST(aext)
-+
-+AC_SUBST(libm_machine_dir)
-+AC_SUBST(machine_dir)
-+AC_SUBST(sys_dir)
-+])
-+
-+# Do all the work for Automake. This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+# Copyright 2002 Free Software Foundation, Inc.
-+
-+# 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 this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# 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 conftestfile 2> /dev/null`
-+ if test "[$]*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftestfile`
-+ fi
-+ if test "[$]*" != "X $srcdir/configure conftestfile" \
-+ && test "[$]*" != "X conftestfile $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".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
-+ fi
-+
-+ test "[$]2" = conftestfile
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+ $1=$2
-+ AC_MSG_RESULT(found)
-+else
-+ $1="$3/missing $2"
-+ AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Define a conditional.
-+
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi])
-+
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
-+
-+# serial 1
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT($USE_MAINTAINER_MODE)
-+ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/configure newlib-1.17.0-new/newlib/libc/machine/avr32/configure
---- newlib-1.17.0/newlib/libc/machine/avr32/configure 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/configure 2009-05-22 09:57:49.000000000 +0200
-@@ -0,0 +1,3950 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.61 for newlib NEWLIB_VERSION.
-+#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+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
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
-+fi
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ case $as_dir in
-+ /*)
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf@gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # scripts with optimization help from Paolo Bonzini. 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" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); 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
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+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
-+fi
-+echo >conf$$.file
-+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
-+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=:
-+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 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=.
-+LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME='newlib'
-+PACKAGE_TARNAME='newlib'
-+PACKAGE_VERSION='NEWLIB_VERSION'
-+PACKAGE_STRING='newlib NEWLIB_VERSION'
-+PACKAGE_BUGREPORT=''
-+
-+ac_unique_file="Makefile.am"
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+MAY_SUPPLY_SYSCALLS_TRUE
-+MAY_SUPPLY_SYSCALLS_FALSE
-+newlib_basedir
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+SET_MAKE
-+CC
-+AS
-+AR
-+RANLIB
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+NEWLIB_CFLAGS
-+LDFLAGS
-+ELIX_LEVEL_0_TRUE
-+ELIX_LEVEL_0_FALSE
-+ELIX_LEVEL_1_TRUE
-+ELIX_LEVEL_1_FALSE
-+ELIX_LEVEL_2_TRUE
-+ELIX_LEVEL_2_FALSE
-+ELIX_LEVEL_3_TRUE
-+ELIX_LEVEL_3_FALSE
-+ELIX_LEVEL_4_TRUE
-+ELIX_LEVEL_4_FALSE
-+USE_LIBTOOL_TRUE
-+USE_LIBTOOL_FALSE
-+OBJEXT
-+oext
-+aext
-+libm_machine_dir
-+machine_dir
-+sys_dir
-+LIBOBJS
-+LTLIBOBJS'
-+ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# 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_TARNAME}'
-+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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=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_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$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_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-+
-+ -without-* | --without-*)
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=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 ;;
-+
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
-+ ;;
-+
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ eval $ac_envvar=\$ac_optarg
-+ export $ac_envvar ;;
-+
-+ *)
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ 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'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Be sure to have absolute directory names.
-+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
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+ esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
-+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
-+ 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 .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
-+# 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 -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
-+ 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 .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-+ 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 newlib NEWLIB_VERSION 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/newlib]
-+ --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
-+ case $ac_init_help in
-+ short | recursive ) echo "Configuration of newlib NEWLIB_VERSION:";;
-+ esac
-+ cat <<\_ACEOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-multilib build many library versions (default)
-+ --enable-target-optspace optimize for space
-+ --enable-malloc-debugging indicate malloc debugging requested
-+ --enable-newlib-mb enable multibyte support
-+ --enable-newlib-iconv enable iconv library support
-+ --enable-newlib-builtin-converters enable specific comma-separated list of iconv converters to be built-in
-+ --enable-newlib-multithread enable support for multiple threads
-+ --enable-newlib-elix-level supply desired elix library level (1-4)
-+ --disable-newlib-io-float disable printf/scanf family float support
-+ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
-+
-+_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" || continue
-+ ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-+ 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
-+newlib configure NEWLIB_VERSION
-+generated by GNU Autoconf 2.61
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 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
-+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 newlib $as_me NEWLIB_VERSION, which was
-+generated by GNU Autoconf 2.61. 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=.
-+ 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=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$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
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
-+ ;;
-+ esac
-+ done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_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=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ 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=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ 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 &&
-+ echo "$as_me: caught signal $ac_signal"
-+ 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'; { (exit 1); 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
-+
-+# 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
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
-+fi
-+shift
-+for ac_site_file
-+do
-+ if test -r "$ac_site_file"; then
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+ 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
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
-+ esac
-+ fi
-+else
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+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,)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,set)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+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
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
-+ fi;;
-+ esac
-+ # Pass precious variables to config.status.
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *\'*) ac_arg=$ac_var=`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.
-+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+ esac
-+ fi
-+done
-+if $ac_cache_corrupted; then
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { (exit 1); exit 1; }; }
-+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_aux_dir=
-+for ac_dir in ../../../.. "$srcdir"/../../../..; do
-+ if test -f "$ac_dir/install-sh"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install-sh -c"
-+ break
-+ elif test -f "$ac_dir/install.sh"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install.sh -c"
-+ break
-+ elif test -f "$ac_dir/shtool"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
-+ fi
-+done
-+if test -z "$ac_aux_dir"; then
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../../.. \"$srcdir\"/../../../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in ../../../.. \"$srcdir\"/../../../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+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 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+if test "${ac_cv_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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 &&
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { (exit 1); exit 1; }; }
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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
-+
-+
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+if test "${ac_cv_host+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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
-+
-+
-+am__api_version="1.4"
-+# 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.
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+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
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$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'
-+
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# 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 conftestfile 2> /dev/null`
-+ if test "$*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftestfile`
-+ fi
-+ if test "$*" != "X $srcdir/configure conftestfile" \
-+ && test "$*" != "X conftestfile $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".
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ test "$2" = conftestfile
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f conftest*
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}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 $. echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm -f conftest.sed
-+
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`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
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ SET_MAKE=
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+# Check whether --enable-multilib was given.
-+if test "${enable_multilib+set}" = set; then
-+ enableval=$enable_multilib; case "${enableval}" in
-+ yes) multilib=yes ;;
-+ no) multilib=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5
-+echo "$as_me: error: bad value ${enableval} for multilib option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ multilib=yes
-+fi
-+
-+# Check whether --enable-target-optspace was given.
-+if test "${enable_target_optspace+set}" = set; then
-+ enableval=$enable_target_optspace; case "${enableval}" in
-+ yes) target_optspace=yes ;;
-+ no) target_optspace=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for target-optspace option" >&5
-+echo "$as_me: error: bad value ${enableval} for target-optspace option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ target_optspace=
-+fi
-+
-+# Check whether --enable-malloc-debugging was given.
-+if test "${enable_malloc_debugging+set}" = set; then
-+ enableval=$enable_malloc_debugging; case "${enableval}" in
-+ yes) malloc_debugging=yes ;;
-+ no) malloc_debugging=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for malloc-debugging option" >&5
-+echo "$as_me: error: bad value ${enableval} for malloc-debugging option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ malloc_debugging=
-+fi
-+
-+# Check whether --enable-newlib-mb was given.
-+if test "${enable_newlib_mb+set}" = set; then
-+ enableval=$enable_newlib_mb; case "${enableval}" in
-+ yes) newlib_mb=yes ;;
-+ no) newlib_mb=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-mb option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-mb option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_mb=
-+fi
-+
-+# Check whether --enable-newlib-iconv was given.
-+if test "${enable_newlib_iconv+set}" = set; then
-+ enableval=$enable_newlib_iconv; case "${enableval}" in
-+ yes) newlib_iconv=yes ;;
-+ no) newlib_iconv=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-iconv option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-iconv option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_iconv=
-+fi
-+
-+# Check whether --enable-newlib-builtin-converters was given.
-+if test "${enable_newlib_builtin_converters+set}" = set; then
-+ enableval=$enable_newlib_builtin_converters; if test x${enableval} = x; then
-+ { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-builtin-converters option - use comma-separated list" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-builtin-converters option - use comma-separated list" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ builtin_converters=${enableval}
-+
-+else
-+ builtin_converters=
-+fi
-+
-+# Check whether --enable-newlib-multithread was given.
-+if test "${enable_newlib_multithread+set}" = set; then
-+ enableval=$enable_newlib_multithread; case "${enableval}" in
-+ yes) newlib_multithread=yes ;;
-+ no) newlib_multithread=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-multithread option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-multithread option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_multithread=yes
-+fi
-+
-+# Check whether --enable-newlib-elix-level was given.
-+if test "${enable_newlib_elix_level+set}" = set; then
-+ enableval=$enable_newlib_elix_level; case "${enableval}" in
-+ 0) newlib_elix_level=0 ;;
-+ 1) newlib_elix_level=1 ;;
-+ 2) newlib_elix_level=2 ;;
-+ 3) newlib_elix_level=3 ;;
-+ 4) newlib_elix_level=4 ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-elix-level option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-elix-level option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_elix_level=0
-+fi
-+
-+# Check whether --enable-newlib-io-float was given.
-+if test "${enable_newlib_io_float+set}" = set; then
-+ enableval=$enable_newlib_io_float; case "${enableval}" in
-+ yes) newlib_io_float=yes ;;
-+ no) newlib_io_float=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-io-float option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-io-float option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_io_float=yes
-+fi
-+
-+# Check whether --enable-newlib-supplied-syscalls was given.
-+if test "${enable_newlib_supplied_syscalls+set}" = set; then
-+ enableval=$enable_newlib_supplied_syscalls; case "${enableval}" in
-+ yes) newlib_may_supply_syscalls=yes ;;
-+ no) newlib_may_supply_syscalls=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-supplied-syscalls option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-supplied-syscalls option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_may_supply_syscalls=yes
-+fi
-+
-+
-+
-+if test x${newlib_may_supply_syscalls} = xyes; then
-+ MAY_SUPPLY_SYSCALLS_TRUE=
-+ MAY_SUPPLY_SYSCALLS_FALSE='#'
-+else
-+ MAY_SUPPLY_SYSCALLS_TRUE='#'
-+ MAY_SUPPLY_SYSCALLS_FALSE=
-+fi
-+
-+
-+test -z "${with_target_subdir}" && with_target_subdir=.
-+
-+if test "${srcdir}" = "."; then
-+ if test "${with_target_subdir}" != "."; then
-+ newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-+ else
-+ newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-+ fi
-+else
-+ newlib_basedir="${srcdir}/../../.."
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-+if test "${ac_cv_target+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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}-
-+
-+
-+PACKAGE=newlib
-+
-+VERSION=1.12.0
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+
-+
-+missing_dir=`cd $ac_aux_dir && pwd`
-+{ echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
-+echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ ACLOCAL=aclocal-${am__api_version}
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working autoconf" >&5
-+echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOCONF=autoconf
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOCONF="$missing_dir/missing autoconf"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
-+echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOMAKE=automake-${am__api_version}
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working autoheader" >&5
-+echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOHEADER=autoheader
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOHEADER="$missing_dir/missing autoheader"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working makeinfo" >&5
-+echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-+ MAKEINFO=makeinfo
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ MAKEINFO="$missing_dir/missing makeinfo"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+
-+
-+# FIXME: We temporarily define our own version of AC_PROG_CC. This is
-+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
-+# are probably using a cross compiler, which will not be able to fully
-+# link an executable. This should really be fixed in autoconf
-+# itself.
-+
-+
-+
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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="gcc"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
-+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+#AC_PROG_CC_GNU
-+
-+if test $ac_cv_c_compiler_gnu = yes; then
-+ GCC=yes
-+ ac_test_CFLAGS="${CFLAGS+set}"
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+# AC_PROG_CC_G
-+ if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+ elif test $ac_cv_prog_cc_g = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-O2"
-+ fi
-+else
-+ GCC=
-+ test "${CFLAGS+set}" = set || CFLAGS="-g"
-+fi
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}as; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$AS"; then
-+ ac_cv_prog_AS="$AS" # 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_AS="${ac_tool_prefix}as"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AS=$ac_cv_prog_AS
-+if test -n "$AS"; then
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_AS"; then
-+ ac_ct_AS=$AS
-+ # Extract the first word of "as", so it can be a program name with args.
-+set dummy as; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_AS"; then
-+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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_AS="as"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AS=$ac_cv_prog_ac_ct_AS
-+if test -n "$ac_ct_AS"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_AS" = x; then
-+ AS=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
-+else
-+ AS="$ac_cv_prog_AS"
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
-+else
-+ AR="$ac_cv_prog_AR"
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+
-+# 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.
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+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
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$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'
-+
-+
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&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
-+
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$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
-+
-+
-+
-+# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-+# at least currently, we never actually build a program, so we never
-+# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-+# fails, because we are probably configuring with a cross compiler
-+# which can't create executables. So we include AC_EXEEXT to keep
-+# automake happy, but we don't execute it, since we don't care about
-+# the result.
-+#if false; then
-+#
-+#fi
-+
-+. ${newlib_basedir}/configure.host
-+
-+newlib_cflags="${newlib_cflags} -fno-builtin"
-+
-+NEWLIB_CFLAGS=${newlib_cflags}
-+
-+
-+LDFLAGS=${ldflags}
-+
-+
-+
-+
-+if test x${newlib_elix_level} = x0; then
-+ ELIX_LEVEL_0_TRUE=
-+ ELIX_LEVEL_0_FALSE='#'
-+else
-+ ELIX_LEVEL_0_TRUE='#'
-+ ELIX_LEVEL_0_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x1; then
-+ ELIX_LEVEL_1_TRUE=
-+ ELIX_LEVEL_1_FALSE='#'
-+else
-+ ELIX_LEVEL_1_TRUE='#'
-+ ELIX_LEVEL_1_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x2; then
-+ ELIX_LEVEL_2_TRUE=
-+ ELIX_LEVEL_2_FALSE='#'
-+else
-+ ELIX_LEVEL_2_TRUE='#'
-+ ELIX_LEVEL_2_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x3; then
-+ ELIX_LEVEL_3_TRUE=
-+ ELIX_LEVEL_3_FALSE='#'
-+else
-+ ELIX_LEVEL_3_TRUE='#'
-+ ELIX_LEVEL_3_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x4; then
-+ ELIX_LEVEL_4_TRUE=
-+ ELIX_LEVEL_4_FALSE='#'
-+else
-+ ELIX_LEVEL_4_TRUE='#'
-+ ELIX_LEVEL_4_FALSE=
-+fi
-+
-+
-+
-+if test x${use_libtool} = xyes; then
-+ USE_LIBTOOL_TRUE=
-+ USE_LIBTOOL_FALSE='#'
-+else
-+ USE_LIBTOOL_TRUE='#'
-+ USE_LIBTOOL_FALSE=
-+fi
-+
-+# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we
-+# use oext, which is set in configure.host based on the target platform.
-+OBJEXT=${oext}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files Makefile"
-+
-+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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_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" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-+ cat confcache >$cache_file
-+ else
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+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}'
-+
-+# Transform confdefs.h into DEFS.
-+# Protect against shell expansion while executing Makefile rules.
-+# Protect against Makefile macro expansion.
-+#
-+# If the first sed substitution is executed (which looks for macros that
-+# take arguments), then branch to the quote section. Otherwise,
-+# look for a macro that doesn't take arguments.
-+ac_script='
-+t clear
-+:clear
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-+t quote
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-+t quote
-+b any
-+:quote
-+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-+s/\[/\\&/g
-+s/\]/\\&/g
-+s/\$/$$/g
-+H
-+:any
-+${
-+ g
-+ s/^\n//
-+ s/\n/ /g
-+ p
-+}
-+'
-+DEFS=`sed -n "$ac_script" confdefs.h`
-+
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; 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=`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.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $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}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## 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=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+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
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # scripts with optimization help from Paolo Bonzini. 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" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); 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
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+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
-+fi
-+echo >conf$$.file
-+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
-+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=:
-+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
-+
-+# 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 newlib $as_me NEWLIB_VERSION, which was
-+generated by GNU Autoconf 2.61. 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
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number and configuration settings, then exit
-+ -q, --quiet 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
-+
-+Configuration files:
-+$config_files
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+newlib config.status NEWLIB_VERSION
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2006 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'
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+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 )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ $ac_shift
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ ac_need_defaults=false;;
-+ --he | --h | --help | --hel | -h )
-+ 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.
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$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
-+if \$ac_cs_recheck; then
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+ case $ac_config_target in
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ 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
-+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 '{ (exit 1); 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")
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+}
-+
-+#
-+# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+MAY_SUPPLY_SYSCALLS_TRUE!$MAY_SUPPLY_SYSCALLS_TRUE$ac_delim
-+MAY_SUPPLY_SYSCALLS_FALSE!$MAY_SUPPLY_SYSCALLS_FALSE$ac_delim
-+newlib_basedir!$newlib_basedir$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+CC!$CC$ac_delim
-+AS!$AS$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+NEWLIB_CFLAGS!$NEWLIB_CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+ELIX_LEVEL_0_TRUE!$ELIX_LEVEL_0_TRUE$ac_delim
-+ELIX_LEVEL_0_FALSE!$ELIX_LEVEL_0_FALSE$ac_delim
-+ELIX_LEVEL_1_TRUE!$ELIX_LEVEL_1_TRUE$ac_delim
-+ELIX_LEVEL_1_FALSE!$ELIX_LEVEL_1_FALSE$ac_delim
-+ELIX_LEVEL_2_TRUE!$ELIX_LEVEL_2_TRUE$ac_delim
-+ELIX_LEVEL_2_FALSE!$ELIX_LEVEL_2_FALSE$ac_delim
-+ELIX_LEVEL_3_TRUE!$ELIX_LEVEL_3_TRUE$ac_delim
-+ELIX_LEVEL_3_FALSE!$ELIX_LEVEL_3_FALSE$ac_delim
-+ELIX_LEVEL_4_TRUE!$ELIX_LEVEL_4_TRUE$ac_delim
-+ELIX_LEVEL_4_FALSE!$ELIX_LEVEL_4_FALSE$ac_delim
-+USE_LIBTOOL_TRUE!$USE_LIBTOOL_TRUE$ac_delim
-+USE_LIBTOOL_FALSE!$USE_LIBTOOL_FALSE$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+oext!$oext$ac_delim
-+aext!$aext$ac_delim
-+libm_machine_dir!$libm_machine_dir$ac_delim
-+machine_dir!$machine_dir$ac_delim
-+sys_dir!$sys_dir$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_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
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[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 ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$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 "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ 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 ||
-+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"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+ as_dirs=
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+ ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# 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=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ 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
-+ sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;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
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-+
-+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"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+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
-+ ;;
-+
-+
-+
-+ esac
-+
-+done # for ac_tag
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# 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 || { (exit 1); exit 1; }
-+fi
-+
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/configure.in newlib-1.17.0-new/newlib/libc/machine/avr32/configure.in
---- newlib-1.17.0/newlib/libc/machine/avr32/configure.in 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/configure.in 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,14 @@
-+dnl This is the newlib/libc/machine/arm configure.in file.
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ(2.59)
-+AC_INIT([newlib],[NEWLIB_VERSION])
-+AC_CONFIG_SRCDIR([Makefile.am])
-+
-+dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-+AC_CONFIG_AUX_DIR(../../../..)
-+
-+NEWLIB_CONFIGURE(../../..)
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/Makefile.am newlib-1.17.0-new/newlib/libc/machine/avr32/Makefile.am
---- newlib-1.17.0/newlib/libc/machine/avr32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/Makefile.am 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,16 @@
-+## Process this file with automake to generate Makefile.in
-+
-+AUTOMAKE_OPTIONS = cygnus
-+
-+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-+
-+AM_CCASFLAGS = $(INCLUDES)
-+
-+noinst_LIBRARIES = lib.a
-+
-+lib_a_SOURCES = strcmp.S strncpy.S memcpy.S
-+lib_a_CCASFLAGS=$(AM_CCASFLAGS)
-+lib_a_CFLAGS = $(AM_CFLAGS)
-+
-+ACLOCAL_AMFLAGS = -I ../../..
-+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/Makefile.in newlib-1.17.0-new/newlib/libc/machine/avr32/Makefile.in
---- newlib-1.17.0/newlib/libc/machine/avr32/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/Makefile.in 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,327 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = .
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
-+host_alias = @host_alias@
-+host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
-+AR = @AR@
-+AS = @AS@
-+CC = @CC@
-+CPP = @CPP@
-+EXEEXT = @EXEEXT@
-+LDFLAGS = @LDFLAGS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+VERSION = @VERSION@
-+aext = @aext@
-+libm_machine_dir = @libm_machine_dir@
-+machine_dir = @machine_dir@
-+newlib_basedir = @newlib_basedir@
-+oext = @oext@
-+sys_dir = @sys_dir@
-+
-+AUTOMAKE_OPTIONS = cygnus
-+
-+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-+
-+noinst_LIBRARIES = lib.a
-+
-+lib_a_SOURCES = strcmp.S strncpy.S memcpy.S
-+
-+ACLOCAL_AMFLAGS = -I ../../..
-+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir)
-+CPPFLAGS =
-+LIBS = @LIBS@
-+lib_a_LIBADD =
-+lib_a_OBJECTS = strcmp.o strncpy.o memcpy.o
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = gtar
-+GZIP_ENV = --best
-+SOURCES = $(lib_a_SOURCES)
-+OBJECTS = $(lib_a_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .o .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-+
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in \
-+ ../../../acinclude.m4 ../../../aclocal.m4 \
-+ ../../../libtool.m4
-+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ $(SHELL) ./config.status --recheck
-+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+ cd $(srcdir) && $(AUTOCONF)
-+
-+mostlyclean-noinstLIBRARIES:
-+
-+clean-noinstLIBRARIES:
-+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+
-+distclean-noinstLIBRARIES:
-+
-+maintainer-clean-noinstLIBRARIES:
-+
-+.c.o:
-+ $(COMPILE) -c $<
-+
-+.s.o:
-+ $(COMPILE) -c $<
-+
-+.S.o:
-+ $(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+ -rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-+ -rm -f lib.a
-+ $(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-+ $(RANLIB) lib.a
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ here=`pwd` && cd $(srcdir) \
-+ && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+ -rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration. Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+ -rm -rf $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-+ mkdir $(distdir)/=build
-+ mkdir $(distdir)/=inst
-+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
-+ cd $(distdir)/=build \
-+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist
-+ -rm -rf $(distdir)
-+ @banner="$(distdir).tar.gz is ready for distribution"; \
-+ dashes=`echo "$$banner" | sed s/./=/g`; \
-+ echo "$$dashes"; \
-+ echo "$$banner"; \
-+ echo "$$dashes"
-+dist: distdir
-+ -chmod -R a+r $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ -rm -rf $(distdir)
-+dist-all: distdir
-+ -chmod -R a+r $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ -rm -rf $(distdir)
-+distdir: $(DISTFILES)
-+ -rm -rf $(distdir)
-+ mkdir $(distdir)
-+ -chmod 777 $(distdir)
-+ @for file in $(DISTFILES); do \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ if test -d $$d/$$file; then \
-+ cp -pr $$d/$$file $(distdir)/$$file; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+ || cp -p $$d/$$file $(distdir)/$$file || :; \
-+ fi; \
-+ done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am:
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-info-am:
-+install-info: install-info-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
-+ mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-+ mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am: distclean-noinstLIBRARIES distclean-compile \
-+ distclean-tags distclean-generic clean-am
-+
-+distclean: distclean-am
-+ -rm -f config.status
-+
-+maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
-+ maintainer-clean-compile maintainer-clean-tags \
-+ maintainer-clean-generic distclean-am
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f config.status
-+
-+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck install-info-am install-info \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/memcpy.S newlib-1.17.0-new/newlib/libc/machine/avr32/memcpy.S
---- newlib-1.17.0/newlib/libc/machine/avr32/memcpy.S 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/memcpy.S 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,269 @@
-+/*
-+ * Copyright (C) 2004 Atmel Norway
-+ */
-+
-+/* Don't use r12 as dst since we must return it unmodified */
-+
-+ .text
-+ .global memcpy
-+ .type memcpy, @function
-+#if defined(__AVR32_HAS_UNALIGNED_WORD__)
-+memcpy:
-+ /* Check if src and dst are aligned
-+ if not do a word based copying. */
-+ or r9, r12, r11
-+ andl r9, 3, COH
-+ brne .Lunaligned_copy
-+
-+ pushm r12, lr
-+ sub r10, 8
-+ brmi .Lword_copy
-+
-+0:
-+ ld.d r8, r11++
-+ sub r10, 8
-+ st.d r12++, r8
-+ brpl 0b
-+
-+.Lword_copy:
-+ sub r10, -4
-+ brmi .Lbyte_copy
-+
-+0:
-+ ld.w r8, r11++
-+ sub r10, 4
-+ st.w r12++, r8
-+ brpl 0b
-+
-+.Lbyte_copy:
-+ sub r10, -4
-+ breq 2f
-+1:
-+ ld.ub r8, r11++
-+ sub r10, 1
-+ st.b r12++, r8
-+ brne 1b
-+2:
-+ popm r12, pc
-+
-+.Lunaligned_copy:
-+ mov r9, r12
-+ sub r10, 4
-+
-+ brmi .Lbyte_copy2
-+
-+0:
-+ ld.w r8, r11++
-+ sub r10, 4
-+ st.w r12++, r8
-+ brpl 0b
-+
-+.Lbyte_copy2:
-+ sub r10, -4
-+ reteq r9
-+1:
-+ ld.ub r8, r11++
-+ sub r10, 1
-+ st.b r12++, r8
-+ brne 1b
-+
-+ ret r9
-+
-+
-+#else
-+
-+#define dst r9
-+#define src r11
-+#define len r10
-+
-+#if defined(__AVR32_UC__)
-+memcpy:
-+ /* If we have less than 8 bytes, don't do anything fancy
-+ just an unrolled byte copy */
-+ cp.w r10, 8
-+ brlt .Lless_than_8
-+ /* Check if src and dst are aligned. */
-+ or r9, r12, r11
-+ andl r9, 3, COH
-+ brne .Lunaligned_copy
-+
-+ /* Check if larger than 31 */
-+ cp.w r10, 32
-+ brge .Lmore_than_31:
-+
-+ /* Less than 32. */
-+ asr r8, r10, 2
-+ rsub r9, r8, 8
-+ add pc, pc, r9 << 2
-+ .irp offset,0,1,2,3,4,5,6
-+ ld.w r9, r11[(6-\offset)*4]
-+ st.w r12[(6-\offset)*4], r9
-+ .endr
-+
-+ add r11, r11, r8 << 2
-+ add r8, r12, r8 << 2
-+ andl r10, 0x3
-+ rsub r10, r10, 4
-+ add pc, pc, r10 << 2
-+ .irp offset,0,1,2
-+ ld.ub r9, r11[2-\offset]
-+ st.b r8[2-\offset], r9
-+ .endr
-+
-+ retal r12
-+
-+.Lless_than_8:
-+ rsub r10, r10, 9
-+ add pc, pc, r10 << 2
-+ .irp offset,0,1,2,3,4,5,6,7
-+ ld.ub r9, r11[7-\offset]
-+ st.b r12[7-\offset], r9
-+ .endr
-+
-+ retal r12
-+
-+.Lmore_than_31:
-+ stm --sp, r6-r7, lr
-+ mov r9, r12
-+
-+.Laligned_copy:
-+ sub r10, 32
-+
-+1: /* Copy 32 bytes at a time */
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ sub r10, 32
-+ brge 1b
-+
-+.Lless_than_32:
-+ /* Copy 16 more bytes if possible */
-+ sub r10, -16
-+ brlt .Lless_than_16
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ ld.d r6, r11++
-+ st.d r9++, r6
-+ sub r10, 16
-+
-+.Lless_than_16:
-+
-+ /* Do the remaining as byte copies */
-+ neg r10
-+ add pc, pc, r10 << 3
-+ nop
-+ nop
-+ .irp offset,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
-+ ld.ub r6, r11[14-\offset],e
-+ st.b r9[14-\offset], r6,e
-+ .endr
-+
-+ ldm sp++, r6-r7, pc
-+
-+.Lunaligned_copy:
-+ /* src and dst are unaligned. */
-+0:
-+ sub r10, 1
-+ ld.ub r9, r11[r10]
-+ st.b r12[r10], r9
-+ brne 0b
-+
-+ retal r12
-+ .size memcpy, . - memcpy
-+
-+#else
-+memcpy:
-+ pref src[0]
-+ mov dst, r12
-+
-+ /* If we have less than 32 bytes, don't do anything fancy */
-+ cp.w len, 32
-+ brge .Lmore_than_31
-+
-+ sub len, 1
-+ retlt r12
-+1: ld.ub r8, src++
-+ st.b r12, r8
-+ sub len, 1
-+ brge 1b
-+ retal r12
-+
-+.Lmore_than_31:
-+ pushm r0-r7, lr
-+
-+ /* Check alignment */
-+ mov r8, src
-+ andl r8, 31, COH
-+ brne .Lunaligned_src
-+ mov r8, dst
-+ andl r8, 3, COH
-+ brne .Lunaligned_dst
-+
-+.Laligned_copy:
-+ sub len, 32
-+ brlt .Lless_than_32
-+
-+1: /* Copy 32 bytes at a time */
-+ pref src[32]
-+ ldm src, r0-r7
-+ sub src, -32
-+ stm dst, r0-r7
-+ sub dst, -32
-+ sub len, 32
-+ brge 1b
-+
-+.Lless_than_32:
-+ /* Copy 16 more bytes if possible */
-+ sub len, -16
-+ brlt .Lless_than_16
-+ ldm src, r0-r3
-+ sub src, -16
-+ sub len, 16
-+ stm dst, r0-r3
-+ sub dst, -16
-+
-+.Lless_than_16:
-+ /* Do the remaining as byte copies */
-+ neg len
-+ add pc, pc, len << 2
-+ .rept 15
-+ ld.ub r0, src++
-+ st.b dst++, r0
-+ .endr
-+
-+ popm r0-r7, pc
-+
-+.Lunaligned_src:
-+ /* Make src cacheline-aligned. r8 = (src & 31) */
-+ rsub r8, r8, 32
-+ sub len, r8
-+1: ld.ub r0, src++
-+ st.b dst++, r0
-+ sub r8, 1
-+ brne 1b
-+
-+ /* If dst is word-aligned, we're ready to go */
-+ pref src[0]
-+ mov r8, 3
-+ tst dst, r8
-+ breq .Laligned_copy
-+
-+.Lunaligned_dst:
-+ /* src is aligned, but dst is not. Expect bad performance */
-+0:
-+ ld.ub r0, src++
-+ st.b dst++, r0
-+ sub len, 1
-+ brne 0b
-+
-+ popm r0-r7, pc
-+ .size memcpy, . - memcpy
-+
-+
-+#endif
-+#endif
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/strcmp.S newlib-1.17.0-new/newlib/libc/machine/avr32/strcmp.S
---- newlib-1.17.0/newlib/libc/machine/avr32/strcmp.S 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/strcmp.S 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,133 @@
-+ .align 2
-+ .global strcmp
-+
-+strcmp:
-+#if !defined(__AVR32_HAS_UNALIGNED_WORD__)
-+#ifdef __AVR32_UC__
-+ /* Check if both strings are aligned. */
-+ or r10, r12, r11
-+ andl r10, 3, COH
-+ brne .Lbyte_strcmp
-+0:
-+ ld.w r10, r12[0]
-+ ld.w r9, r11[0]
-+ tnbz r10
-+ breq 1f
-+ cp.w r10, r9
-+ brne 1f
-+ ld.w r10, r12[4]
-+ ld.w r9, r11[4]
-+ tnbz r10
-+ breq 1f
-+ cp.w r10, r9
-+ brne 1f
-+ ld.w r10, r12[8]
-+ ld.w r9, r11[8]
-+ tnbz r10
-+ breq 1f
-+ cp.w r10, r9
-+ brne 1f
-+ ld.w r10, r12[12]
-+ ld.w r9, r11[12]
-+ tnbz r10
-+ breq 1f
-+ sub r12, -16
-+ sub r11, -16
-+ cp.w r10, r9
-+ breq 0b
-+1:
-+ bfextu r12, r10, 24, 8
-+ bfextu r11, r9, 24, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ bfextu r12, r10, 16, 8
-+ bfextu r11, r9, 16, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ bfextu r12, r10, 8, 8
-+ bfextu r11, r9, 8, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ castu.b r10
-+ castu.b r9
-+ sub r10, r9
-+ ret r10
-+
-+.Lbyte_strcmp:
-+0:
-+ ld.ub r10, r11[0]
-+ ld.ub r9, r12[0]
-+ cp.w r10, 0
-+ reteq r9
-+ sub r9, r10
-+ retne r9
-+ ld.ub r10, r11[1]
-+ ld.ub r9, r12[1]
-+ cp.w r10, 0
-+ reteq r9
-+ sub r9, r10
-+ retne r9
-+ ld.ub r10, r11[2]
-+ ld.ub r9, r12[2]
-+ cp.w r10, 0
-+ reteq r9
-+ sub r9, r10
-+ retne r9
-+ ld.ub r10, r11[3]
-+ ld.ub r9, r12[3]
-+ cp.w r10, 0
-+ reteq r9
-+ sub r9, r10
-+ retne r9
-+ sub r11, -4
-+ sub r12, -4
-+ rjmp 0b
-+#else
-+0:
-+ ld.ub r10, r11++
-+ ld.ub r9, r12++
-+ cp.w r10, 0
-+ reteq r9
-+ sub r9, r10
-+ breq 0b
-+ ret r9
-+#endif
-+#else
-+0:
-+ ld.w r10, r12++
-+ ld.w r9, r11++
-+ tnbz r10
-+ breq 1f
-+ cp.w r10, r9
-+ breq 0b
-+
-+1:
-+ bfextu r12, r10, 24, 8
-+ bfextu r11, r9, 24, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ bfextu r12, r10, 16, 8
-+ bfextu r11, r9, 16, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ bfextu r12, r10, 8, 8
-+ bfextu r11, r9, 8, 8
-+ reteq r12
-+ sub r12, r11
-+ retne r12
-+
-+ castu.b r10
-+ castu.b r9
-+ sub r10, r9
-+ ret r10
-+#endif
-diff -Naur newlib-1.17.0/newlib/libc/machine/avr32/strncpy.S newlib-1.17.0-new/newlib/libc/machine/avr32/strncpy.S
---- newlib-1.17.0/newlib/libc/machine/avr32/strncpy.S 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/avr32/strncpy.S 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,39 @@
-+ .align 2
-+ .global strncpy
-+
-+strncpy :
-+#ifdef __AVR32_UC__
-+ mov r8, 0
-+0:
-+ cp.w r10, r8
-+ reteq r12
-+ ld.ub r9, r11[r8]
-+ st.b r12[r8], r9
-+ sub r8, -1
-+ cp.w r9, 0
-+ brne 0b
-+
-+1:
-+ cp.w r10, r8
-+ reteq r12
-+ st.b r12[r8], r9
-+ sub r8, -1
-+ rjmp 1b
-+#else
-+ mov r8, r12
-+0:
-+ sub r10, 1
-+ ld.ub r9, r11++
-+ retmi r12
-+ st.b r8++, r9
-+ cp.w r9, 0
-+ brne 0b
-+
-+1:
-+ sub r10, 1
-+ retmi r12
-+ st.b r8++, r9
-+ rjmp 1b
-+
-+
-+#endif
-diff -Naur newlib-1.17.0/newlib/libc/machine/configure newlib-1.17.0-new/newlib/libc/machine/configure
---- newlib-1.17.0/newlib/libc/machine/configure 2008-12-22 20:45:41.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/configure 2009-05-22 09:57:50.000000000 +0200
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for newlib 1.17.0.
-+# Generated by GNU Autoconf 2.61 for newlib 1.17.0.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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 Bourne compatible
-+# 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- 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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+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
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +128,388 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# 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
-
--# 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
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
- fi
-
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- 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
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-
-- ;;
-- 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
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf@gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); 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 sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- 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
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ 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'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+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=:
-@@ -222,7 +518,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+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'"
-@@ -231,15 +548,6 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
-
-
- # Check that we are running under the correct shell.
-@@ -390,29 +698,26 @@
-
-
-
-+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`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME='newlib'
- PACKAGE_TARNAME='newlib'
-@@ -424,81 +729,228 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--ac_subdirs_all="$ac_subdirs_all a29k"
--ac_subdirs_all="$ac_subdirs_all arm"
--ac_subdirs_all="$ac_subdirs_all bfin"
--ac_subdirs_all="$ac_subdirs_all cris"
--ac_subdirs_all="$ac_subdirs_all crx"
--ac_subdirs_all="$ac_subdirs_all d10v"
--ac_subdirs_all="$ac_subdirs_all d30v"
--ac_subdirs_all="$ac_subdirs_all fr30"
--ac_subdirs_all="$ac_subdirs_all frv"
--ac_subdirs_all="$ac_subdirs_all h8300"
--ac_subdirs_all="$ac_subdirs_all h8500"
--ac_subdirs_all="$ac_subdirs_all hppa"
--ac_subdirs_all="$ac_subdirs_all i386"
--ac_subdirs_all="$ac_subdirs_all i960"
--ac_subdirs_all="$ac_subdirs_all iq2000"
--ac_subdirs_all="$ac_subdirs_all lm32"
--ac_subdirs_all="$ac_subdirs_all m32c"
--ac_subdirs_all="$ac_subdirs_all m32r"
--ac_subdirs_all="$ac_subdirs_all m68hc11"
--ac_subdirs_all="$ac_subdirs_all m68k"
--ac_subdirs_all="$ac_subdirs_all m88k"
--ac_subdirs_all="$ac_subdirs_all mep"
--ac_subdirs_all="$ac_subdirs_all mips"
--ac_subdirs_all="$ac_subdirs_all mn10200"
--ac_subdirs_all="$ac_subdirs_all mn10300"
--ac_subdirs_all="$ac_subdirs_all mt"
--ac_subdirs_all="$ac_subdirs_all necv70"
--ac_subdirs_all="$ac_subdirs_all powerpc"
--ac_subdirs_all="$ac_subdirs_all sh"
--ac_subdirs_all="$ac_subdirs_all sparc"
--ac_subdirs_all="$ac_subdirs_all spu"
--ac_subdirs_all="$ac_subdirs_all tic4x"
--ac_subdirs_all="$ac_subdirs_all tic80"
--ac_subdirs_all="$ac_subdirs_all v850"
--ac_subdirs_all="$ac_subdirs_all w65"
--ac_subdirs_all="$ac_subdirs_all x86_64"
--ac_subdirs_all="$ac_subdirs_all xscale"
--ac_subdirs_all="$ac_subdirs_all xstormy16"
--ac_subdirs_all="$ac_subdirs_all z8k"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir SED DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL CFLAGS CPPFLAGS ac_ct_CC EXEEXT EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP subdirs HAVE_MACHINE_DIR_TRUE HAVE_MACHINE_DIR_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+MAY_SUPPLY_SYSCALLS_TRUE
-+MAY_SUPPLY_SYSCALLS_FALSE
-+newlib_basedir
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+CC
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+AS
-+AR
-+RANLIB
-+READELF
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+CCAS
-+CCASFLAGS
-+NEWLIB_CFLAGS
-+LDFLAGS
-+ELIX_LEVEL_0_TRUE
-+ELIX_LEVEL_0_FALSE
-+ELIX_LEVEL_1_TRUE
-+ELIX_LEVEL_1_FALSE
-+ELIX_LEVEL_2_TRUE
-+ELIX_LEVEL_2_FALSE
-+ELIX_LEVEL_3_TRUE
-+ELIX_LEVEL_3_FALSE
-+ELIX_LEVEL_4_TRUE
-+ELIX_LEVEL_4_FALSE
-+USE_LIBTOOL_TRUE
-+USE_LIBTOOL_FALSE
-+OBJEXT
-+oext
-+aext
-+lpfx
-+libm_machine_dir
-+machine_dir
-+sys_dir
-+SED
-+DLLTOOL
-+OBJDUMP
-+LIBTOOL
-+CFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+GREP
-+EGREP
-+FGREP
-+LD
-+DUMPBIN
-+ac_ct_DUMPBIN
-+NM
-+LN_S
-+lt_ECHO
-+DSYMUTIL
-+NMEDIT
-+LIPO
-+OTOOL
-+OTOOL64
-+CPP
-+subdirs
-+HAVE_MACHINE_DIR_TRUE
-+HAVE_MACHINE_DIR_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CCAS
-+CCASFLAGS
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP'
-+ac_subdirs_all='a29k
-+arm
-+avr32
-+bfin
-+cris
-+crx
-+d10v
-+d30v
-+fr30
-+frv
-+h8300
-+h8500
-+hppa
-+i386
-+i960
-+iq2000
-+lm32
-+m32c
-+m32r
-+m68hc11
-+m68k
-+m88k
-+mep
-+mips
-+mn10200
-+mn10300
-+mt
-+necv70
-+powerpc
-+sh
-+sparc
-+spu
-+tic4x
-+tic80
-+v850
-+w65
-+x86_64
-+xscale
-+xstormy16
-+z8k'
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -525,34 +977,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+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"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ 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_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -574,33 +1040,45 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- eval "enable_$ac_feature=no" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=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_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -627,6 +1105,12 @@
- -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 ;;
-@@ -651,13 +1135,16 @@
- | --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 | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -722,6 +1209,16 @@
- | --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 ;;
-@@ -774,24 +1271,20 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/-/_/g'`
-- eval "with_$ac_package=no" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -822,8 +1315,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -843,27 +1335,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+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=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -890,82 +1374,76 @@
- 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 .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # 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 its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-- { (exit 1); exit 1; }; }
-- fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CCAS_set=${CCAS+set}
--ac_env_CCAS_value=$CCAS
--ac_cv_env_CCAS_set=${CCAS+set}
--ac_cv_env_CCAS_value=$CCAS
--ac_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_env_CCASFLAGS_value=$CCASFLAGS
--ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_cv_env_CCASFLAGS_value=$CCASFLAGS
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-+ 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.
-@@ -994,9 +1472,6 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -1014,15 +1489,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --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]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --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/newlib]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1059,10 +1541,8 @@
- --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-shared[=PKGS]
-- build shared libraries [default=yes]
-- --enable-static[=PKGS]
-- build static libraries [default=yes]
-+ --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)
-@@ -1081,128 +1561,95 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include 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
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ 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
-- # Check for guested configure; otherwise get Cygnus style 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
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ 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
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- newlib configure 1.17.0
--generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.61
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 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 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+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 newlib $as_me 1.17.0, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1221,7 +1668,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 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`
-@@ -1235,6 +1682,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1256,7 +1704,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1267,7 +1714,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1289,9 +1736,7 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1302,8 +1747,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# 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.
- {
-@@ -1316,20 +1761,34 @@
- _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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ 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"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1340,22 +1799,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1367,26 +1832,24 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-- ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1417,14 +1880,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1440,8 +1906,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1453,12 +1919,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+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"
-+ 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,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1483,8 +1948,7 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1501,12 +1965,6 @@
- { (exit 1); exit 1; }; }
- 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
--
-
-
-
-@@ -1531,67 +1989,92 @@
-
-
-
-+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
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in ../../.. "$srcdir"/../../..; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&5
--echo "$as_me: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. \"$srcdir\"/../../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in ../../.. \"$srcdir\"/../../.." >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# 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.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ 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 &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
-
-
- am__api_version="1.9"
-@@ -1608,8 +2091,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1631,7 +2114,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ 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.
-@@ -1650,21 +2133,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # 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 path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1674,8 +2158,8 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1717,20 +2201,20 @@
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+ 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"
-+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1782,8 +2266,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1796,54 +2280,57 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`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
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
-- eval ac_cv_prog_make_${ac_make}_set=yes
--else
-- eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -1858,7 +2345,7 @@
-
- DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
-@@ -1868,8 +2355,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -1896,15 +2383,15 @@
- fi
-
-
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
-- enableval="$enable_dependency_tracking"
-+ enableval=$enable_dependency_tracking;
-+fi
-
--fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-@@ -1922,10 +2409,9 @@
-
-
-
--# Check whether --enable-multilib or --disable-multilib was given.
-+# Check whether --enable-multilib was given.
- if test "${enable_multilib+set}" = set; then
-- enableval="$enable_multilib"
-- case "${enableval}" in
-+ enableval=$enable_multilib; case "${enableval}" in
- yes) multilib=yes ;;
- no) multilib=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5
-@@ -1934,11 +2420,11 @@
- esac
- else
- multilib=yes
--fi;
--# Check whether --enable-target-optspace or --disable-target-optspace was given.
-+fi
-+
-+# Check whether --enable-target-optspace was given.
- if test "${enable_target_optspace+set}" = set; then
-- enableval="$enable_target_optspace"
-- case "${enableval}" in
-+ enableval=$enable_target_optspace; case "${enableval}" in
- yes) target_optspace=yes ;;
- no) target_optspace=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for target-optspace option" >&5
-@@ -1947,11 +2433,11 @@
- esac
- else
- target_optspace=
--fi;
--# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-+fi
-+
-+# Check whether --enable-malloc-debugging was given.
- if test "${enable_malloc_debugging+set}" = set; then
-- enableval="$enable_malloc_debugging"
-- case "${enableval}" in
-+ enableval=$enable_malloc_debugging; case "${enableval}" in
- yes) malloc_debugging=yes ;;
- no) malloc_debugging=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for malloc-debugging option" >&5
-@@ -1960,11 +2446,11 @@
- esac
- else
- malloc_debugging=
--fi;
--# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-+fi
-+
-+# Check whether --enable-newlib-multithread was given.
- if test "${enable_newlib_multithread+set}" = set; then
-- enableval="$enable_newlib_multithread"
-- case "${enableval}" in
-+ enableval=$enable_newlib_multithread; case "${enableval}" in
- yes) newlib_multithread=yes ;;
- no) newlib_multithread=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-multithread option" >&5
-@@ -1973,11 +2459,11 @@
- esac
- else
- newlib_multithread=yes
--fi;
--# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-+fi
-+
-+# Check whether --enable-newlib-iconv was given.
- if test "${enable_newlib_iconv+set}" = set; then
-- enableval="$enable_newlib_iconv"
-- if test "${newlib_iconv+set}" != set; then
-+ enableval=$enable_newlib_iconv; if test "${newlib_iconv+set}" != set; then
- case "${enableval}" in
- yes) newlib_iconv=yes ;;
- no) newlib_iconv=no ;;
-@@ -1988,11 +2474,11 @@
- fi
- else
- newlib_iconv=${newlib_iconv}
--fi;
--# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-+fi
-+
-+# Check whether --enable-newlib-elix-level was given.
- if test "${enable_newlib_elix_level+set}" = set; then
-- enableval="$enable_newlib_elix_level"
-- case "${enableval}" in
-+ enableval=$enable_newlib_elix_level; case "${enableval}" in
- 0) newlib_elix_level=0 ;;
- 1) newlib_elix_level=1 ;;
- 2) newlib_elix_level=2 ;;
-@@ -2004,11 +2490,11 @@
- esac
- else
- newlib_elix_level=0
--fi;
--# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-+fi
-+
-+# Check whether --enable-newlib-io-float was given.
- if test "${enable_newlib_io_float+set}" = set; then
-- enableval="$enable_newlib_io_float"
-- case "${enableval}" in
-+ enableval=$enable_newlib_io_float; case "${enableval}" in
- yes) newlib_io_float=yes ;;
- no) newlib_io_float=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-io-float option" >&5
-@@ -2017,11 +2503,11 @@
- esac
- else
- newlib_io_float=yes
--fi;
--# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-+fi
-+
-+# Check whether --enable-newlib-supplied-syscalls was given.
- if test "${enable_newlib_supplied_syscalls+set}" = set; then
-- enableval="$enable_newlib_supplied_syscalls"
-- case "${enableval}" in
-+ enableval=$enable_newlib_supplied_syscalls; case "${enableval}" in
- yes) newlib_may_supply_syscalls=yes ;;
- no) newlib_may_supply_syscalls=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-supplied-syscalls option" >&5
-@@ -2030,7 +2516,8 @@
- esac
- else
- newlib_may_supply_syscalls=yes
--fi;
-+fi
-+
-
-
- if test x${newlib_may_supply_syscalls} = xyes; then
-@@ -2056,26 +2543,41 @@
- fi
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ 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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
-
-
-
-@@ -2128,8 +2630,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2142,32 +2644,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2180,27 +2684,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -2235,8 +2753,8 @@
-
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2249,30 +2767,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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="gcc"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2361,8 +2881,8 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-@@ -2381,8 +2901,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2396,7 +2916,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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
-@@ -2407,6 +2927,7 @@
- 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.
-@@ -2424,20 +2945,21 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
--echo "$as_me:$LINENO: checking whether we are using GNU C" >&5
--echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using GNU C" >&5
-+echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2457,8 +2979,8 @@
- ac_cv_c_compiler_gnu=no
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-
- if test $ac_cv_c_compiler_gnu = yes; then
- GCC=yes
-@@ -2467,13 +2989,16 @@
- CFLAGS=
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2489,38 +3014,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=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
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -2552,8 +3157,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2566,32 +3171,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2604,26 +3211,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AS=$ac_ct_AS
-+ if test "x$ac_ct_AS" = x; then
-+ AS=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
- else
- AS="$ac_cv_prog_AS"
- fi
-@@ -2631,8 +3253,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2645,32 +3267,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2683,26 +3307,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -2710,8 +3349,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2724,32 +3363,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2762,27 +3403,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -2790,8 +3445,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args.
- set dummy ${ac_tool_prefix}readelf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_READELF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2804,32 +3459,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_READELF="${ac_tool_prefix}readelf"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- READELF=$ac_cv_prog_READELF
- if test -n "$READELF"; then
-- echo "$as_me:$LINENO: result: $READELF" >&5
--echo "${ECHO_T}$READELF" >&6
-+ { echo "$as_me:$LINENO: result: $READELF" >&5
-+echo "${ECHO_T}$READELF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_READELF"; then
- ac_ct_READELF=$READELF
- # Extract the first word of "readelf", so it can be a program name with args.
- set dummy readelf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2842,27 +3499,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_READELF="readelf"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF=":"
- fi
- fi
- ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
- if test -n "$ac_ct_READELF"; then
-- echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
--echo "${ECHO_T}$ac_ct_READELF" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
-+echo "${ECHO_T}$ac_ct_READELF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- READELF=$ac_ct_READELF
-+ if test "x$ac_ct_READELF" = x; then
-+ READELF=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ READELF=$ac_ct_READELF
-+ fi
- else
- READELF="$ac_cv_prog_READELF"
- fi
-@@ -2881,8 +3552,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2904,7 +3575,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ 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.
-@@ -2923,21 +3594,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # 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 path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2951,17 +3623,17 @@
- # Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */
- ac_given_INSTALL=$INSTALL
-
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+ # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- USE_MAINTAINER_MODE=$enableval
-+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
--fi;
-- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
- if test $USE_MAINTAINER_MODE = yes; then
-@@ -3081,64 +3753,89 @@
-
-
-
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
--if test "${lt_cv_path_SED+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-+if test "${ac_cv_path_SED+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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" | sed 99q >conftest.sed
-+ $as_unset ac_script || ac_script=
-+ # Extract the first word of "sed gsed" to use in msg output
-+if test -z "$SED"; then
-+set dummy sed gsed; ac_prog_name=$2
-+if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
-+ 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 lt_ac_prog in sed gsed; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-- fi
-- done
-- done
--done
--IFS=$as_save_IFS
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-- test ! -f $lt_ac_sed && continue
-- cat /dev/null > conftest.in
-- lt_ac_count=0
-- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-- # Check for GNU sed and select it if it is found.
-- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-- lt_cv_path_SED=$lt_ac_sed
-- break
-- fi
-- while true; do
-- cat conftest.in conftest.in >conftest.tmp
-- mv conftest.tmp conftest.in
-- cp conftest.in conftest.nl
-- echo >>conftest.nl
-- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-- cmp -s conftest.out conftest.nl || break
-- # 10000 chars as input seems more than enough
-- test $lt_ac_count -gt 10 && break
-- lt_ac_count=`expr $lt_ac_count + 1`
-- if test $lt_ac_count -gt $lt_ac_max; then
-- lt_ac_max=$lt_ac_count
-- lt_cv_path_SED=$lt_ac_sed
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
-+fi
-+
-+SED="$ac_cv_path_SED"
-+if test -z "$SED"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
--SED=$lt_cv_path_SED
-+else
-+ ac_cv_path_SED=$SED
-+fi
-
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
-+ SED="$ac_cv_path_SED"
-+ rm -f conftest.sed
-
- test -z "$SED" && SED=sed
- Xsed="$SED -e 1s/^X//"
-@@ -3161,8 +3858,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3175,32 +3872,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3213,27 +3912,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AS=$ac_ct_AS
-+ if test "x$ac_ct_AS" = x; then
-+ AS="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
- else
- AS="$ac_cv_prog_AS"
- fi
-@@ -3241,8 +3954,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3255,32 +3968,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--echo "${ECHO_T}$DLLTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3293,27 +4008,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_DLLTOOL="dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
- fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- DLLTOOL=$ac_ct_DLLTOOL
-+ if test "x$ac_ct_DLLTOOL" = x; then
-+ DLLTOOL="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DLLTOOL=$ac_ct_DLLTOOL
-+ fi
- else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
- fi
-@@ -3321,8 +4050,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3335,32 +4064,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3373,27 +4104,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OBJDUMP=$ac_ct_OBJDUMP
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
-+ fi
- else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-@@ -3454,8 +4199,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3468,32 +4213,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3506,36 +4253,51 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&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.
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3548,98 +4310,59 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
-+ fi
- fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-+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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
--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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$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"
-+ 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"
- echo "$as_me:$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.
-@@ -3657,22 +4380,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3685,36 +4409,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3727,29 +4453,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -3762,21 +4504,35 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -3801,47 +4557,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # 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 | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-+ 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
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -3853,19 +4639,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3884,22 +4672,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -3910,9 +4703,8 @@
- 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 | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -3926,14 +4718,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3953,14 +4745,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ 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 ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -3978,12 +4776,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4006,50 +4804,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4065,38 +4862,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -4112,12 +4989,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4151,12 +5028,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ 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 -std1. */
-+ 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);};
-@@ -4171,205 +5053,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4378,8 +5112,8 @@
-
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4461,58 +5195,273 @@
- fi
- done
-
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_CC_dependencies_compiler_type=none
--fi
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$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
-+
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for fgrep" >&5
-+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_FGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-+ then ac_cv_path_FGREP="$GREP -F"
-+ else
-+ # Extract the first word of "fgrep" to use in msg output
-+if test -z "$FGREP"; then
-+set dummy fgrep; ac_prog_name=$2
-+if test "${ac_cv_path_FGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-
--fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
--CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+ $ac_path_FGREP_found && break 3
-+ done
-+done
-
-+done
-+IFS=$as_save_IFS
-
-
--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
-
-+FGREP="$ac_cv_path_FGREP"
-+if test -z "$FGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-- fi
-+ ac_cv_path_FGREP=$FGREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-
--echo "$as_me:$LINENO: checking for fgrep" >&5
--echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
--if test "${ac_cv_prog_fgrep+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if echo 'ab*c' | (grep -F 'ab*c') >/dev/null 2>&1
-- then ac_cv_prog_fgrep='grep -F'
-- else ac_cv_prog_fgrep='fgrep'
-- fi
-+ fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_fgrep" >&5
--echo "${ECHO_T}$ac_cv_prog_fgrep" >&6
-- FGREP=$ac_cv_prog_fgrep
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
-+ FGREP="$ac_cv_path_FGREP"
-
-
- test -z "$GREP" && GREP=grep
-@@ -4535,18 +5484,18 @@
-
-
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# 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
-+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
- with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -4575,11 +5524,11 @@
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4612,17 +5561,17 @@
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4636,8 +5585,8 @@
- ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-@@ -4648,8 +5597,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
--echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4697,8 +5646,8 @@
- : ${lt_cv_path_NM=no}
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
- else
-@@ -4708,8 +5657,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4722,25 +5671,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $DUMPBIN" >&5
--echo "${ECHO_T}$DUMPBIN" >&6
-+ { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+echo "${ECHO_T}$DUMPBIN" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$DUMPBIN" && break
- done
- fi
-@@ -4750,8 +5701,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4764,30 +5715,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
--echo "${ECHO_T}$ac_ct_DUMPBIN" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_DUMPBIN" && break
- done
--test -n "$ac_ct_DUMPBIN" || ac_ct_DUMPBIN=":"
-
-- DUMPBIN=$ac_ct_DUMPBIN
-+ if test "x$ac_ct_DUMPBIN" = x; then
-+ DUMPBIN=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DUMPBIN=$ac_ct_DUMPBIN
-+ fi
- fi
-
-
-@@ -4802,43 +5768,43 @@
-
-
-
--echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
--echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
- if test "${lt_cv_nm_interface+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4812: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5778: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4815: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5781: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4818: output\"" >&5)
-+ (eval echo "\"\$as_me:5784: 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
--echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
--echo "${ECHO_T}$lt_cv_nm_interface" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
- # find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4957,11 +5923,11 @@
- fi
-
- if test -n $lt_cv_sys_max_cmd_len ; then
-- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
-- echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
-+ { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
-
-@@ -4974,8 +5940,8 @@
- : ${MV="mv -f"}
- : ${RM="rm -f"}
-
--echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
--echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
-@@ -4984,18 +5950,18 @@
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
--echo "$as_me:$LINENO: result: $xsi_shell" >&5
--echo "${ECHO_T}$xsi_shell" >&6
-+{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+echo "${ECHO_T}$xsi_shell" >&6; }
-
-
--echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
--echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
--echo "$as_me:$LINENO: result: $lt_shell_append" >&5
--echo "${ECHO_T}$lt_shell_append" >&6
-+{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+echo "${ECHO_T}$lt_shell_append" >&6; }
-
-
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -5029,15 +5995,15 @@
-
-
-
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -5065,8 +6031,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5079,32 +6045,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5117,27 +6085,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OBJDUMP=$ac_ct_OBJDUMP
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
-+ fi
- else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-@@ -5149,8 +6131,8 @@
-
-
-
--echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5345,8 +6327,8 @@
- esac
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$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
-@@ -5365,8 +6347,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5379,32 +6361,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5417,27 +6401,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-+ if test "x$ac_ct_AR" = x; then
-+ AR="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -5458,8 +6456,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5472,32 +6470,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5510,27 +6510,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -5545,8 +6559,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5559,32 +6573,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5597,27 +6613,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -5690,8 +6720,8 @@
-
-
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5910,11 +6940,11 @@
- 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
-- echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
-+ { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
-- echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
-
-
-@@ -5939,11 +6969,11 @@
-
-
-
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
-- enableval="$enable_libtool_lock"
-+ enableval=$enable_libtool_lock;
-+fi
-
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
- # Some flags need to be propagated to the compiler or linker for good
-@@ -5970,7 +7000,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5973 "configure"' > conftest.$ac_ext
-+ echo '#line 7003 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -6062,8 +7092,8 @@
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
-- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6089,35 +7119,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--lt_cv_cc_needs_belf=no
-+ lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6126,8 +7153,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$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"
-@@ -6166,8 +7193,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6180,32 +7207,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--echo "${ECHO_T}$DSYMUTIL" >&6
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6218,27 +7247,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":"
- fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- DSYMUTIL=$ac_ct_DSYMUTIL
-+ if test "x$ac_ct_DSYMUTIL" = x; then
-+ DSYMUTIL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DSYMUTIL=$ac_ct_DSYMUTIL
-+ fi
- else
- DSYMUTIL="$ac_cv_prog_DSYMUTIL"
- fi
-@@ -6246,8 +7289,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6260,32 +7303,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $NMEDIT" >&5
--echo "${ECHO_T}$NMEDIT" >&6
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6298,27 +7343,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":"
- fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
-- echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--echo "${ECHO_T}$ac_ct_NMEDIT" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- NMEDIT=$ac_ct_NMEDIT
-+ if test "x$ac_ct_NMEDIT" = x; then
-+ NMEDIT=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ NMEDIT=$ac_ct_NMEDIT
-+ fi
- else
- NMEDIT="$ac_cv_prog_NMEDIT"
- fi
-@@ -6326,8 +7385,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6340,32 +7399,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $LIPO" >&5
--echo "${ECHO_T}$LIPO" >&6
-+ { echo "$as_me:$LINENO: result: $LIPO" >&5
-+echo "${ECHO_T}$LIPO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6378,27 +7439,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_LIPO" && ac_cv_prog_ac_ct_LIPO=":"
- fi
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
-- echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
--echo "${ECHO_T}$ac_ct_LIPO" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+echo "${ECHO_T}$ac_ct_LIPO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- LIPO=$ac_ct_LIPO
-+ if test "x$ac_ct_LIPO" = x; then
-+ LIPO=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ LIPO=$ac_ct_LIPO
-+ fi
- else
- LIPO="$ac_cv_prog_LIPO"
- fi
-@@ -6406,8 +7481,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6420,32 +7495,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OTOOL" >&5
--echo "${ECHO_T}$OTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $OTOOL" >&5
-+echo "${ECHO_T}$OTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6458,27 +7535,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OTOOL" && ac_cv_prog_ac_ct_OTOOL=":"
- fi
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
--echo "${ECHO_T}$ac_ct_OTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OTOOL=$ac_ct_OTOOL
-+ if test "x$ac_ct_OTOOL" = x; then
-+ OTOOL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OTOOL=$ac_ct_OTOOL
-+ fi
- else
- OTOOL="$ac_cv_prog_OTOOL"
- fi
-@@ -6486,8 +7577,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6500,32 +7591,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OTOOL64" >&5
--echo "${ECHO_T}$OTOOL64" >&6
-+ { echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+echo "${ECHO_T}$OTOOL64" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6538,27 +7631,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OTOOL64" && ac_cv_prog_ac_ct_OTOOL64=":"
- fi
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
--echo "${ECHO_T}$ac_ct_OTOOL64" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OTOOL64=$ac_ct_OTOOL64
-+ if test "x$ac_ct_OTOOL64" = x; then
-+ OTOOL64=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OTOOL64=$ac_ct_OTOOL64
-+ fi
- else
- OTOOL64="$ac_cv_prog_OTOOL64"
- fi
-@@ -6589,8 +7696,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6616,10 +7723,10 @@
- rm -f conftest.*
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6
-- echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6643,41 +7750,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_ld_exported_symbols_list=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--lt_cv_ld_exported_symbols_list=no
-+ lt_cv_ld_exported_symbols_list=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -6718,8 +7822,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -6753,24 +7857,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -6779,9 +7881,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6791,24 +7894,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -6819,6 +7920,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -6836,8 +7938,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -6860,24 +7962,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -6886,9 +7986,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6898,24 +7999,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -6926,6 +8025,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -6948,8 +8048,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6973,35 +8073,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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.
-@@ -7057,6 +8153,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* 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))
-@@ -7076,18 +8173,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7100,12 +8206,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7128,9 +8236,9 @@
- inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7144,38 +8252,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7190,9 +8295,9 @@
- for ac_header in dlfcn.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7206,38 +8311,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7257,10 +8359,9 @@
-
-
-
-- # Check whether --enable-shared or --disable-shared was given.
-+ # Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
-- enableval="$enable_shared"
-- p=${PACKAGE-default}
-+ enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
-@@ -7279,7 +8380,8 @@
- esac
- else
- enable_shared=yes
--fi;
-+fi
-+
-
-
-
-@@ -7288,10 +8390,9 @@
-
-
-
-- # Check whether --enable-static or --disable-static was given.
-+ # Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
-- enableval="$enable_static"
-- p=${PACKAGE-default}
-+ enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
-@@ -7310,7 +8411,8 @@
- esac
- else
- enable_static=yes
--fi;
-+fi
-+
-
-
-
-@@ -7320,13 +8422,13 @@
-
-
-
--# Check whether --with-pic or --without-pic was given.
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
-- withval="$with_pic"
-- pic_mode="$withval"
-+ withval=$with_pic; pic_mode="$withval"
- else
- pic_mode=default
--fi;
-+fi
-+
-
- test -z "$pic_mode" && pic_mode=default
-
-@@ -7336,10 +8438,9 @@
-
-
-
-- # Check whether --enable-fast-install or --disable-fast-install was given.
-+ # Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
-- enableval="$enable_fast_install"
-- p=${PACKAGE-default}
-+ enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
-@@ -7358,7 +8459,8 @@
- esac
- else
- enable_fast_install=yes
--fi;
-+fi
-+
-
-
-
-@@ -7418,8 +8520,8 @@
- setopt NO_GLOB_SUBST
- fi
-
--echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7433,8 +8535,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
-
-
-@@ -7526,8 +8628,8 @@
- case $deplibs_check_method in
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7579,11 +8681,11 @@
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7592,8 +8694,8 @@
-
- if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
-- echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7645,11 +8747,11 @@
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7729,8 +8831,8 @@
- if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-- echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7747,11 +8849,11 @@
- -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:7750: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8852: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7754: \$? = $ac_status" >&5
-+ echo "$as_me:8856: \$? = $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.
-@@ -7764,8 +8866,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$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"
-@@ -7784,8 +8886,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
-@@ -8056,8 +9158,8 @@
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-
-
-
-@@ -8068,8 +9170,8 @@
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
-- echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8086,11 +9188,11 @@
- -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:8089: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8093: \$? = $ac_status" >&5
-+ echo "$as_me:9195: \$? = $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.
-@@ -8103,8 +9205,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
-@@ -8127,8 +9229,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8155,8 +9257,8 @@
- LDFLAGS="$save_LDFLAGS"
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-@@ -8170,8 +9272,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8191,11 +9293,11 @@
- -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:8194: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9296: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8198: \$? = $ac_status" >&5
-+ echo "$as_me:9300: \$? = $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
-@@ -8217,16 +9319,16 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8246,11 +9348,11 @@
- -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:8249: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9351: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8253: \$? = $ac_status" >&5
-+ echo "$as_me:9355: \$? = $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
-@@ -8272,8 +9374,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-@@ -8281,16 +9383,16 @@
- 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
-- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-- echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -8305,8 +9407,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag=
-@@ -8763,27 +9865,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -8801,8 +9899,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -8832,27 +9932,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -8870,8 +9966,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -9088,35 +10186,33 @@
- int foo(void) {}
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
- else
-@@ -9373,8 +10469,8 @@
- fi
- fi
-
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
-
- with_gnu_ld=$with_gnu_ld
-@@ -9410,46 +10506,52 @@
- # 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.
-- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-- $RM conftest*
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ $RM conftest*
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 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:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ 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:$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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-- then
-- archive_cmds_need_lc=no
-- else
-- archive_cmds_need_lc=yes
-- fi
-- allow_undefined_flag=$lt_save_allow_undefined_flag
-- else
-- cat conftest.err 1>&5
-- fi
-- $RM conftest*
-- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+ 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
-+{ echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6; }
-+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
- ;;
- esac
- fi
-@@ -9612,8 +10714,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- case $host_os in
-@@ -10029,12 +11131,17 @@
- 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
-- save_LDFLAGS=$LDFLAGS
-- save_libdir=$libdir
-- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-- cat >conftest.$ac_ext <<_ACEOF
-+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10050,40 +11157,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-- shlibpath_overrides_runpath=yes
-+ lt_cv_shlibpath_overrides_runpath=yes
- fi
-
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- LDFLAGS=$save_LDFLAGS
-- libdir=$save_libdir
-+ 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
-@@ -10293,8 +11402,8 @@
- dynamic_linker=no
- ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -10395,8 +11504,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" ||
- test -n "$runpath_var" ||
-@@ -10420,8 +11529,8 @@
- # directories.
- hardcode_action=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
-
- if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
-@@ -10465,8 +11574,8 @@
-
- darwin*)
- # if libdl is installed we need to link against it
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10479,56 +11588,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -10542,8 +11648,8 @@
- ;;
-
- *)
-- echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10570,73 +11676,64 @@
-
- #undef shl_load
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shl_load ();
- /* 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_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != shl_load;
-+return shl_load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_shl_load=no
-+ ac_cv_func_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
- else
-- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10649,61 +11746,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shl_load ();
- int
- main ()
- {
--shl_load ();
-+return shl_load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10730,73 +11824,64 @@
-
- #undef dlopen
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- /* 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_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_dlopen=no
-+ ac_cv_func_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
- else
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10809,61 +11894,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10876,61 +11958,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_svld_dlopen=no
-+ ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
-- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10943,56 +12022,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return dld_link ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dld_dld_link=no
-+ ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-@@ -11032,8 +12108,8 @@
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
-- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11043,7 +12119,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11046 "configure"
-+#line 12122 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11123,13 +12199,13 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$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\"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11139,7 +12215,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11142 "configure"
-+#line 12218 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11219,8 +12295,8 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
-@@ -11258,13 +12334,13 @@
-
- striplib=
- old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
-@@ -11272,16 +12348,16 @@
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- fi
-@@ -11298,13 +12374,13 @@
-
-
- # Report which library types will actually be built
-- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
-+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
-- echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -11324,15 +12400,15 @@
- fi
- ;;
- esac
-- echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
-- echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
-- echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
-+ { echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
-
-
-@@ -11358,7 +12434,7 @@
-
-
-
-- ac_config_commands="$ac_config_commands libtool"
-+ ac_config_commands="$ac_config_commands libtool"
-
-
-
-@@ -11370,161 +12446,85 @@
-
- if test -n "${machine_dir}"; then
- case ${machine_dir} in
-- a29k)
--
--subdirs="$subdirs a29k"
-+ a29k) subdirs="$subdirs a29k"
- ;;
-- arm)
--
--subdirs="$subdirs arm"
-+ arm) subdirs="$subdirs arm"
- ;;
-- bfin)
--
--subdirs="$subdirs bfin"
-+ avr32) subdirs="$subdirs avr32"
- ;;
-- cris)
--
--subdirs="$subdirs cris"
-+ bfin) subdirs="$subdirs bfin"
- ;;
-- crx)
--
--subdirs="$subdirs crx"
-+ cris) subdirs="$subdirs cris"
- ;;
-- d10v)
--
--subdirs="$subdirs d10v"
-+ crx) subdirs="$subdirs crx"
- ;;
-- d30v)
--
--subdirs="$subdirs d30v"
-+ d10v) subdirs="$subdirs d10v"
- ;;
-- fr30)
--
--subdirs="$subdirs fr30"
-+ d30v) subdirs="$subdirs d30v"
- ;;
-- frv)
--
--subdirs="$subdirs frv"
-+ fr30) subdirs="$subdirs fr30"
- ;;
-- h8300)
--
--subdirs="$subdirs h8300"
-+ frv) subdirs="$subdirs frv"
- ;;
-- h8500)
--
--subdirs="$subdirs h8500"
-+ h8300) subdirs="$subdirs h8300"
- ;;
-- hppa)
--
--subdirs="$subdirs hppa"
-+ h8500) subdirs="$subdirs h8500"
- ;;
-- i386)
--
--subdirs="$subdirs i386"
-+ hppa) subdirs="$subdirs hppa"
- ;;
-- i960)
--
--subdirs="$subdirs i960"
-+ i386) subdirs="$subdirs i386"
- ;;
-- iq2000)
--
--subdirs="$subdirs iq2000"
-+ i960) subdirs="$subdirs i960"
- ;;
-- lm32)
--
--subdirs="$subdirs lm32"
-+ iq2000) subdirs="$subdirs iq2000"
- ;;
-- m32c)
--
--subdirs="$subdirs m32c"
-+ lm32) subdirs="$subdirs lm32"
- ;;
-- m32r)
--
--subdirs="$subdirs m32r"
-+ m32c) subdirs="$subdirs m32c"
- ;;
-- m68hc11)
--
--subdirs="$subdirs m68hc11"
-+ m32r) subdirs="$subdirs m32r"
- ;;
-- m68k)
--
--subdirs="$subdirs m68k"
-+ m68hc11) subdirs="$subdirs m68hc11"
- ;;
-- m88k)
--
--subdirs="$subdirs m88k"
-+ m68k) subdirs="$subdirs m68k"
- ;;
-- mep )
--
--subdirs="$subdirs mep"
-+ m88k) subdirs="$subdirs m88k"
- ;;
-- mips)
--
--subdirs="$subdirs mips"
-+ mep ) subdirs="$subdirs mep"
- ;;
-- mn10200)
--
--subdirs="$subdirs mn10200"
-+ mips) subdirs="$subdirs mips"
- ;;
-- mn10300)
--
--subdirs="$subdirs mn10300"
-+ mn10200) subdirs="$subdirs mn10200"
- ;;
-- mt)
--
--subdirs="$subdirs mt"
-+ mn10300) subdirs="$subdirs mn10300"
- ;;
-- necv70)
--
--subdirs="$subdirs necv70"
-+ mt) subdirs="$subdirs mt"
- ;;
-- powerpc)
--
--subdirs="$subdirs powerpc"
-+ necv70) subdirs="$subdirs necv70"
- ;;
-- sh)
--
--subdirs="$subdirs sh"
-+ powerpc) subdirs="$subdirs powerpc"
- ;;
-- sparc)
--
--subdirs="$subdirs sparc"
-+ sh) subdirs="$subdirs sh"
- ;;
-- spu)
--
--subdirs="$subdirs spu"
-+ sparc) subdirs="$subdirs sparc"
- ;;
-- tic4x)
--
--subdirs="$subdirs tic4x"
-+ spu) subdirs="$subdirs spu"
- ;;
-- tic80)
--
--subdirs="$subdirs tic80"
-+ tic4x) subdirs="$subdirs tic4x"
- ;;
-- v850)
--
--subdirs="$subdirs v850"
-+ tic80) subdirs="$subdirs tic80"
- ;;
-- w65)
--
--subdirs="$subdirs w65"
-+ v850) subdirs="$subdirs v850"
- ;;
-- x86_64)
--
--subdirs="$subdirs x86_64"
-+ w65) subdirs="$subdirs w65"
- ;;
-- xscale)
--
--subdirs="$subdirs xscale"
-+ x86_64) subdirs="$subdirs x86_64"
- ;;
-- xstormy16)
--
--subdirs="$subdirs xstormy16"
-+ xscale) subdirs="$subdirs xscale"
- ;;
-- z8k)
--
--subdirs="$subdirs z8k"
-+ xstormy16) subdirs="$subdirs xstormy16"
-+ ;;
-+ z8k) subdirs="$subdirs z8k"
- ;;
- esac;
- fi
-@@ -11540,7 +12540,7 @@
- fi
-
-
-- ac_config_files="$ac_config_files Makefile"
-+ac_config_files="$ac_config_files Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -11560,39 +12560,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ 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 \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
-- : clear
-+ :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!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" && echo "updating cache $cache_file"
-+ 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" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -11601,63 +12620,48 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# 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
--
- # Transform confdefs.h into DEFS.
- # Protect against shell expansion while executing Makefile rules.
- # Protect against Makefile macro expansion.
- #
- # If the first sed substitution is executed (which looks for macros that
--# take arguments), then we branch to the quote section. Otherwise,
-+# take arguments), then branch to the quote section. Otherwise,
- # look for a macro that doesn't take arguments.
--cat >confdef2opt.sed <<\_ACEOF
-+ac_script='
- t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-+:clear
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
- t quote
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
- t quote
--d
--: quote
--s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
--s,\[,\\&,g
--s,\],\\&,g
--s,\$,$$,g
--p
--_ACEOF
--# We use echo to avoid assuming a particular line-breaking character.
--# The extra dot is to prevent the shell from consuming trailing
--# line-breaks from the sub-command output. A line-break within
--# single-quotes doesn't work because, if this script is created in a
--# platform that uses two characters for line-breaks (e.g., DOS), tr
--# would break.
--ac_LF_and_DOT=`echo; echo .`
--DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
--rm -f confdef2opt.sed
-+b any
-+:quote
-+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-+s/\[/\\&/g
-+s/\]/\\&/g
-+s/\$/$$/g
-+H
-+:any
-+${
-+ g
-+ s/^\n//
-+ s/\n/ /g
-+ p
-+}
-+'
-+DEFS=`sed -n "$ac_script" confdefs.h`
-
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`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.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -11772,17 +12776,45 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -11792,8 +12824,43 @@
- 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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -11807,18 +12874,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+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
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -11826,159 +12894,120 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
--
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# 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
--
--# 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
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- 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
-
-- ;;
-- 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
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); 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 sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- 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
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ 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'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+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=:
-@@ -11987,7 +13016,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+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'"
-@@ -11996,31 +13046,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# 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. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by newlib $as_me 1.17.0, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -12028,30 +13061,19 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_commands="$ac_config_commands"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -12059,7 +13081,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -12073,19 +13095,21 @@
- $config_commands
-
- Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- newlib config.status 1.17.0
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -12096,60 +13120,42 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
-- --header | --heade | --head | --hea )
-- $ac_shift
-- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-- ac_need_defaults=false;;
-+ --he | --h | --help | --hel | -h )
-+ 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.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -12165,17 +13171,28 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-@@ -12436,22 +13453,23 @@
-
- _ACEOF
-
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "libtool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+ case $ac_config_target in
-+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- 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
-@@ -12462,396 +13480,492 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# 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 ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s,@SHELL@,$SHELL,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s,@exec_prefix@,$exec_prefix,;t t
--s,@prefix@,$prefix,;t t
--s,@program_transform_name@,$program_transform_name,;t t
--s,@bindir@,$bindir,;t t
--s,@sbindir@,$sbindir,;t t
--s,@libexecdir@,$libexecdir,;t t
--s,@datadir@,$datadir,;t t
--s,@sysconfdir@,$sysconfdir,;t t
--s,@sharedstatedir@,$sharedstatedir,;t t
--s,@localstatedir@,$localstatedir,;t t
--s,@libdir@,$libdir,;t t
--s,@includedir@,$includedir,;t t
--s,@oldincludedir@,$oldincludedir,;t t
--s,@infodir@,$infodir,;t t
--s,@mandir@,$mandir,;t t
--s,@build_alias@,$build_alias,;t t
--s,@host_alias@,$host_alias,;t t
--s,@target_alias@,$target_alias,;t t
--s,@DEFS@,$DEFS,;t t
--s,@ECHO_C@,$ECHO_C,;t t
--s,@ECHO_N@,$ECHO_N,;t t
--s,@ECHO_T@,$ECHO_T,;t t
--s,@LIBS@,$LIBS,;t t
--s,@MAY_SUPPLY_SYSCALLS_TRUE@,$MAY_SUPPLY_SYSCALLS_TRUE,;t t
--s,@MAY_SUPPLY_SYSCALLS_FALSE@,$MAY_SUPPLY_SYSCALLS_FALSE,;t t
--s,@newlib_basedir@,$newlib_basedir,;t t
--s,@build@,$build,;t t
--s,@build_cpu@,$build_cpu,;t t
--s,@build_vendor@,$build_vendor,;t t
--s,@build_os@,$build_os,;t t
--s,@host@,$host,;t t
--s,@host_cpu@,$host_cpu,;t t
--s,@host_vendor@,$host_vendor,;t t
--s,@host_os@,$host_os,;t t
--s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@CYGPATH_W@,$CYGPATH_W,;t t
--s,@PACKAGE@,$PACKAGE,;t t
--s,@VERSION@,$VERSION,;t t
--s,@ACLOCAL@,$ACLOCAL,;t t
--s,@AUTOCONF@,$AUTOCONF,;t t
--s,@AUTOMAKE@,$AUTOMAKE,;t t
--s,@AUTOHEADER@,$AUTOHEADER,;t t
--s,@MAKEINFO@,$MAKEINFO,;t t
--s,@install_sh@,$install_sh,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s,@mkdir_p@,$mkdir_p,;t t
--s,@AWK@,$AWK,;t t
--s,@SET_MAKE@,$SET_MAKE,;t t
--s,@am__leading_dot@,$am__leading_dot,;t t
--s,@AMTAR@,$AMTAR,;t t
--s,@am__tar@,$am__tar,;t t
--s,@am__untar@,$am__untar,;t t
--s,@CC@,$CC,;t t
--s,@DEPDIR@,$DEPDIR,;t t
--s,@am__include@,$am__include,;t t
--s,@am__quote@,$am__quote,;t t
--s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s,@CCDEPMODE@,$CCDEPMODE,;t t
--s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s,@AS@,$AS,;t t
--s,@ac_ct_AS@,$ac_ct_AS,;t t
--s,@AR@,$AR,;t t
--s,@ac_ct_AR@,$ac_ct_AR,;t t
--s,@RANLIB@,$RANLIB,;t t
--s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@READELF@,$READELF,;t t
--s,@ac_ct_READELF@,$ac_ct_READELF,;t t
--s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s,@MAINT@,$MAINT,;t t
--s,@CCAS@,$CCAS,;t t
--s,@CCASFLAGS@,$CCASFLAGS,;t t
--s,@NEWLIB_CFLAGS@,$NEWLIB_CFLAGS,;t t
--s,@LDFLAGS@,$LDFLAGS,;t t
--s,@ELIX_LEVEL_0_TRUE@,$ELIX_LEVEL_0_TRUE,;t t
--s,@ELIX_LEVEL_0_FALSE@,$ELIX_LEVEL_0_FALSE,;t t
--s,@ELIX_LEVEL_1_TRUE@,$ELIX_LEVEL_1_TRUE,;t t
--s,@ELIX_LEVEL_1_FALSE@,$ELIX_LEVEL_1_FALSE,;t t
--s,@ELIX_LEVEL_2_TRUE@,$ELIX_LEVEL_2_TRUE,;t t
--s,@ELIX_LEVEL_2_FALSE@,$ELIX_LEVEL_2_FALSE,;t t
--s,@ELIX_LEVEL_3_TRUE@,$ELIX_LEVEL_3_TRUE,;t t
--s,@ELIX_LEVEL_3_FALSE@,$ELIX_LEVEL_3_FALSE,;t t
--s,@ELIX_LEVEL_4_TRUE@,$ELIX_LEVEL_4_TRUE,;t t
--s,@ELIX_LEVEL_4_FALSE@,$ELIX_LEVEL_4_FALSE,;t t
--s,@USE_LIBTOOL_TRUE@,$USE_LIBTOOL_TRUE,;t t
--s,@USE_LIBTOOL_FALSE@,$USE_LIBTOOL_FALSE,;t t
--s,@OBJEXT@,$OBJEXT,;t t
--s,@oext@,$oext,;t t
--s,@aext@,$aext,;t t
--s,@lpfx@,$lpfx,;t t
--s,@libm_machine_dir@,$libm_machine_dir,;t t
--s,@machine_dir@,$machine_dir,;t t
--s,@sys_dir@,$sys_dir,;t t
--s,@SED@,$SED,;t t
--s,@DLLTOOL@,$DLLTOOL,;t t
--s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
--s,@OBJDUMP@,$OBJDUMP,;t t
--s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
--s,@LIBTOOL@,$LIBTOOL,;t t
--s,@CFLAGS@,$CFLAGS,;t t
--s,@CPPFLAGS@,$CPPFLAGS,;t t
--s,@ac_ct_CC@,$ac_ct_CC,;t t
--s,@EXEEXT@,$EXEEXT,;t t
--s,@EGREP@,$EGREP,;t t
--s,@FGREP@,$FGREP,;t t
--s,@GREP@,$GREP,;t t
--s,@LD@,$LD,;t t
--s,@DUMPBIN@,$DUMPBIN,;t t
--s,@ac_ct_DUMPBIN@,$ac_ct_DUMPBIN,;t t
--s,@NM@,$NM,;t t
--s,@LN_S@,$LN_S,;t t
--s,@lt_ECHO@,$lt_ECHO,;t t
--s,@DSYMUTIL@,$DSYMUTIL,;t t
--s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t
--s,@NMEDIT@,$NMEDIT,;t t
--s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t
--s,@LIPO@,$LIPO,;t t
--s,@ac_ct_LIPO@,$ac_ct_LIPO,;t t
--s,@OTOOL@,$OTOOL,;t t
--s,@ac_ct_OTOOL@,$ac_ct_OTOOL,;t t
--s,@OTOOL64@,$OTOOL64,;t t
--s,@ac_ct_OTOOL64@,$ac_ct_OTOOL64,;t t
--s,@CPP@,$CPP,;t t
--s,@subdirs@,$subdirs,;t t
--s,@HAVE_MACHINE_DIR_TRUE@,$HAVE_MACHINE_DIR_TRUE,;t t
--s,@HAVE_MACHINE_DIR_FALSE@,$HAVE_MACHINE_DIR_FALSE,;t t
--s,@LIBOBJS@,$LIBOBJS,;t t
--s,@LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+MAY_SUPPLY_SYSCALLS_TRUE!$MAY_SUPPLY_SYSCALLS_TRUE$ac_delim
-+MAY_SUPPLY_SYSCALLS_FALSE!$MAY_SUPPLY_SYSCALLS_FALSE$ac_delim
-+newlib_basedir!$newlib_basedir$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+CC!$CC$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+AS!$AS$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+READELF!$READELF$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+CCAS!$CCAS$ac_delim
-+CCASFLAGS!$CCASFLAGS$ac_delim
-+NEWLIB_CFLAGS!$NEWLIB_CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+ELIX_LEVEL_0_TRUE!$ELIX_LEVEL_0_TRUE$ac_delim
-+ELIX_LEVEL_0_FALSE!$ELIX_LEVEL_0_FALSE$ac_delim
-+ELIX_LEVEL_1_TRUE!$ELIX_LEVEL_1_TRUE$ac_delim
-+ELIX_LEVEL_1_FALSE!$ELIX_LEVEL_1_FALSE$ac_delim
-+ELIX_LEVEL_2_TRUE!$ELIX_LEVEL_2_TRUE$ac_delim
-+ELIX_LEVEL_2_FALSE!$ELIX_LEVEL_2_FALSE$ac_delim
-+ELIX_LEVEL_3_TRUE!$ELIX_LEVEL_3_TRUE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+ELIX_LEVEL_3_FALSE!$ELIX_LEVEL_3_FALSE$ac_delim
-+ELIX_LEVEL_4_TRUE!$ELIX_LEVEL_4_TRUE$ac_delim
-+ELIX_LEVEL_4_FALSE!$ELIX_LEVEL_4_FALSE$ac_delim
-+USE_LIBTOOL_TRUE!$USE_LIBTOOL_TRUE$ac_delim
-+USE_LIBTOOL_FALSE!$USE_LIBTOOL_FALSE$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+oext!$oext$ac_delim
-+aext!$aext$ac_delim
-+lpfx!$lpfx$ac_delim
-+libm_machine_dir!$libm_machine_dir$ac_delim
-+machine_dir!$machine_dir$ac_delim
-+sys_dir!$sys_dir$ac_delim
-+SED!$SED$ac_delim
-+DLLTOOL!$DLLTOOL$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+FGREP!$FGREP$ac_delim
-+LD!$LD$ac_delim
-+DUMPBIN!$DUMPBIN$ac_delim
-+ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
-+NM!$NM$ac_delim
-+LN_S!$LN_S$ac_delim
-+lt_ECHO!$lt_ECHO$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
-+LIPO!$LIPO$ac_delim
-+OTOOL!$OTOOL$ac_delim
-+OTOOL64!$OTOOL64$ac_delim
-+CPP!$CPP$ac_delim
-+subdirs!$subdirs$ac_delim
-+HAVE_MACHINE_DIR_TRUE!$HAVE_MACHINE_DIR_TRUE$ac_delim
-+HAVE_MACHINE_DIR_FALSE!$HAVE_MACHINE_DIR_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
- _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
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[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 ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$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 "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
- esac
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ 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 ||
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+ 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
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+_ACEOF
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
-- # 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. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# 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=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ 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
- sed "$ac_vpsub
- $extrasub
-@@ -12859,142 +13973,43 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t
--s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
--s,@INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_dest" : 'X\(//\)[^/]' \| \
-- X"$ac_dest" : 'X\(//\)$' \| \
-- X"$ac_dest" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;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
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+
-+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"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+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;}
-
-- ac_builddir=.
--
--if test "$ac_dir" != .; then
-- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ 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
-+ ;;
-
--case $srcdir in
-- .) # No --srcdir option. We are building in place.
-- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+ esac
-
-
-- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
-- case $ac_dest in
-- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+ case $ac_file$ac_mode in
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
-@@ -13004,18 +14019,29 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-- dirpart=`(dirname "$mf") 2>/dev/null ||
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- else
- continue
- fi
-@@ -13037,49 +14063,76 @@
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
-- fdir=`(dirname "$file") 2>/dev/null ||
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir=$dirpart/$fdir
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-- libtool )
-+ "libtool":C)
-
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
-@@ -13720,11 +14773,10 @@
- chmod +x "$ofile"
-
- ;;
-+
- esac
--done
--_ACEOF
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-@@ -13754,7 +14806,7 @@
- fi
-
- #
--# CONFIG_SUBDIRS section, as fixed in confsubdir.m4.
-+# CONFIG_SUBDIRS section.
- #
- if test "$no_recursion" != yes; then
-
-@@ -13801,7 +14853,12 @@
- case $ac_arg in
- *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
-- ac_sub_configure_args="$ac_arg $ac_sub_configure_args"
-+ ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-+
-+ # Pass --silent
-+ if test "$silent" = yes; then
-+ ac_sub_configure_args="--silent $ac_sub_configure_args"
-+ fi
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-@@ -13810,97 +14867,83 @@
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
-- { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
--echo "$as_me: configuring in $ac_dir" >&6;}
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-+ echo "$as_me:$LINENO: $ac_msg" >&5
-+ echo "$ac_msg" >&6
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ 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"
-@@ -13924,8 +14967,8 @@
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-- *) # Relative path.
-- ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-+ *) # Relative name.
-+ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-diff -Naur newlib-1.17.0/newlib/libc/machine/configure.in newlib-1.17.0-new/newlib/libc/machine/configure.in
---- newlib-1.17.0/newlib/libc/machine/configure.in 2008-12-11 21:05:38.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/machine/configure.in 2009-05-22 09:57:50.000000000 +0200
-@@ -24,6 +24,7 @@
- case ${machine_dir} in
- a29k) AC_CONFIG_SUBDIRS(a29k) ;;
- arm) AC_CONFIG_SUBDIRS(arm) ;;
-+ avr32) AC_CONFIG_SUBDIRS(avr32) ;;
- bfin) AC_CONFIG_SUBDIRS(bfin) ;;
- cris) AC_CONFIG_SUBDIRS(cris) ;;
- crx) AC_CONFIG_SUBDIRS(crx) ;;
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/aclocal.m4 newlib-1.17.0-new/newlib/libc/sys/avr32/aclocal.m4
---- newlib-1.17.0/newlib/libc/sys/avr32/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/aclocal.m4 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,366 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+dnl This provides configure definitions used by all the newlib
-+dnl configure.in files.
-+
-+dnl Basic newlib configury. This calls basic introductory stuff,
-+dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST. It also runs
-+dnl configure.host. The only argument is the relative path to the top
-+dnl newlib directory.
-+
-+AC_DEFUN(NEWLIB_CONFIGURE,
-+[
-+dnl Default to --enable-multilib
-+AC_ARG_ENABLE(multilib,
-+[ --enable-multilib build many library versions (default)],
-+[case "${enableval}" in
-+ yes) multilib=yes ;;
-+ no) multilib=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
-+ esac], [multilib=yes])dnl
-+
-+dnl Support --enable-target-optspace
-+AC_ARG_ENABLE(target-optspace,
-+[ --enable-target-optspace optimize for space],
-+[case "${enableval}" in
-+ yes) target_optspace=yes ;;
-+ no) target_optspace=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
-+ esac], [target_optspace=])dnl
-+
-+dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-+AC_ARG_ENABLE(malloc-debugging,
-+[ --enable-malloc-debugging indicate malloc debugging requested],
-+[case "${enableval}" in
-+ yes) malloc_debugging=yes ;;
-+ no) malloc_debugging=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
-+ esac], [malloc_debugging=])dnl
-+
-+dnl Support --enable-newlib-multithread
-+AC_ARG_ENABLE(newlib-multithread,
-+[ --enable-newlib-multithread enable support for multiple threads],
-+[case "${enableval}" in
-+ yes) newlib_multithread=yes ;;
-+ no) newlib_multithread=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
-+ esac], [newlib_multithread=yes])dnl
-+
-+dnl Support --enable-newlib-iconv
-+AC_ARG_ENABLE(newlib-iconv,
-+[ --enable-newlib-iconv enable iconv library support],
-+[if test "${newlib_iconv+set}" != set; then
-+ case "${enableval}" in
-+ yes) newlib_iconv=yes ;;
-+ no) newlib_iconv=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-+ esac
-+ fi], [newlib_iconv=${newlib_iconv}])dnl
-+
-+dnl Support --enable-newlib-elix-level
-+AC_ARG_ENABLE(newlib-elix-level,
-+[ --enable-newlib-elix-level supply desired elix library level (1-4)],
-+[case "${enableval}" in
-+ 0) newlib_elix_level=0 ;;
-+ 1) newlib_elix_level=1 ;;
-+ 2) newlib_elix_level=2 ;;
-+ 3) newlib_elix_level=3 ;;
-+ 4) newlib_elix_level=4 ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
-+ esac], [newlib_elix_level=0])dnl
-+
-+dnl Support --disable-newlib-io-float
-+AC_ARG_ENABLE(newlib-io-float,
-+[ --disable-newlib-io-float disable printf/scanf family float support],
-+[case "${enableval}" in
-+ yes) newlib_io_float=yes ;;
-+ no) newlib_io_float=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
-+ esac], [newlib_io_float=yes])dnl
-+
-+dnl Support --disable-newlib-supplied-syscalls
-+AC_ARG_ENABLE(newlib-supplied-syscalls,
-+[ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-+[case "${enableval}" in
-+ yes) newlib_may_supply_syscalls=yes ;;
-+ no) newlib_may_supply_syscalls=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
-+ esac], [newlib_may_supply_syscalls=yes])dnl
-+
-+AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-+
-+dnl We may get other options which we don't document:
-+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-+
-+test -z "[$]{with_target_subdir}" && with_target_subdir=.
-+
-+if test "[$]{srcdir}" = "."; then
-+ if test "[$]{with_target_subdir}" != "."; then
-+ newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-+ else
-+ newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-+ fi
-+else
-+ newlib_basedir="[$]{srcdir}/$1"
-+fi
-+AC_SUBST(newlib_basedir)
-+
-+AC_CANONICAL_SYSTEM
-+
-+AM_INIT_AUTOMAKE(newlib, 1.14.0.atmel.1.0.1)
-+
-+# FIXME: We temporarily define our own version of AC_PROG_CC. This is
-+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
-+# are probably using a cross compiler, which will not be able to fully
-+# link an executable. This should really be fixed in autoconf
-+# itself.
-+
-+AC_DEFUN(LIB_AC_PROG_CC,
-+[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-+AC_CHECK_PROG(CC, gcc, gcc)
-+if test -z "$CC"; then
-+ AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-+fi
-+
-+AC_PROG_CC_GNU
-+
-+if test $ac_cv_prog_gcc = yes; then
-+ GCC=yes
-+dnl Check whether -g works, even if CFLAGS is set, in case the package
-+dnl plays around with CFLAGS (such as to build both debugging and
-+dnl normal versions of a library), tasteless as that idea is.
-+ ac_test_CFLAGS="${CFLAGS+set}"
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+ AC_PROG_CC_G
-+ if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+ elif test $ac_cv_prog_cc_g = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-O2"
-+ fi
-+else
-+ GCC=
-+ test "${CFLAGS+set}" = set || CFLAGS="-g"
-+fi
-+])
-+
-+LIB_AC_PROG_CC
-+
-+AC_CHECK_TOOL(AS, as)
-+AC_CHECK_TOOL(AR, ar)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+
-+AC_PROG_INSTALL
-+
-+AM_MAINTAINER_MODE
-+
-+# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-+# at least currently, we never actually build a program, so we never
-+# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-+# fails, because we are probably configuring with a cross compiler
-+# which can't create executables. So we include AC_EXEEXT to keep
-+# automake happy, but we don't execute it, since we don't care about
-+# the result.
-+if false; then
-+ AC_EXEEXT
-+fi
-+
-+. [$]{newlib_basedir}/configure.host
-+
-+newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-+
-+NEWLIB_CFLAGS=${newlib_cflags}
-+AC_SUBST(NEWLIB_CFLAGS)
-+
-+LDFLAGS=${ldflags}
-+AC_SUBST(LDFLAGS)
-+
-+AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-+AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-+AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-+AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-+AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-+
-+AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-+
-+# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we
-+# use oext, which is set in configure.host based on the target platform.
-+OBJEXT=${oext}
-+
-+AC_SUBST(OBJEXT)
-+AC_SUBST(oext)
-+AC_SUBST(aext)
-+
-+AC_SUBST(libm_machine_dir)
-+AC_SUBST(machine_dir)
-+AC_SUBST(sys_dir)
-+])
-+
-+# Do all the work for Automake. This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+# Copyright 2002 Free Software Foundation, Inc.
-+
-+# 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 this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# 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 conftestfile 2> /dev/null`
-+ if test "[$]*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftestfile`
-+ fi
-+ if test "[$]*" != "X $srcdir/configure conftestfile" \
-+ && test "[$]*" != "X conftestfile $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".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
-+ fi
-+
-+ test "[$]2" = conftestfile
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+ $1=$2
-+ AC_MSG_RESULT(found)
-+else
-+ $1="$3/missing $2"
-+ AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Define a conditional.
-+
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi])
-+
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
-+
-+# serial 1
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT($USE_MAINTAINER_MODE)
-+ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/confdefs.h newlib-1.17.0-new/newlib/libc/sys/avr32/confdefs.h
---- newlib-1.17.0/newlib/libc/sys/avr32/confdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/confdefs.h 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1 @@
-+
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/configure newlib-1.17.0-new/newlib/libc/sys/avr32/configure
---- newlib-1.17.0/newlib/libc/sys/avr32/configure 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/configure 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,3922 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.61 for newlib NEWLIB_VERSION.
-+#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+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
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
-+fi
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ case $as_dir in
-+ /*)
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf@gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # scripts with optimization help from Paolo Bonzini. 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" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); 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
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+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
-+fi
-+echo >conf$$.file
-+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
-+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=:
-+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 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=.
-+LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME='newlib'
-+PACKAGE_TARNAME='newlib'
-+PACKAGE_VERSION='NEWLIB_VERSION'
-+PACKAGE_STRING='newlib NEWLIB_VERSION'
-+PACKAGE_BUGREPORT=''
-+
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+MAY_SUPPLY_SYSCALLS_TRUE
-+MAY_SUPPLY_SYSCALLS_FALSE
-+newlib_basedir
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+SET_MAKE
-+CC
-+AS
-+AR
-+RANLIB
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+NEWLIB_CFLAGS
-+LDFLAGS
-+ELIX_LEVEL_0_TRUE
-+ELIX_LEVEL_0_FALSE
-+ELIX_LEVEL_1_TRUE
-+ELIX_LEVEL_1_FALSE
-+ELIX_LEVEL_2_TRUE
-+ELIX_LEVEL_2_FALSE
-+ELIX_LEVEL_3_TRUE
-+ELIX_LEVEL_3_FALSE
-+ELIX_LEVEL_4_TRUE
-+ELIX_LEVEL_4_FALSE
-+USE_LIBTOOL_TRUE
-+USE_LIBTOOL_FALSE
-+OBJEXT
-+oext
-+aext
-+libm_machine_dir
-+machine_dir
-+sys_dir
-+LIBOBJS
-+LTLIBOBJS'
-+ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# 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_TARNAME}'
-+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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=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_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$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_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-+
-+ -without-* | --without-*)
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=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 ;;
-+
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
-+ ;;
-+
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ eval $ac_envvar=\$ac_optarg
-+ export $ac_envvar ;;
-+
-+ *)
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ 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'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Be sure to have absolute directory names.
-+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
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+ esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
-+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
-+ 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 .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
-+# 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 -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
-+ 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 .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-+ 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 newlib NEWLIB_VERSION 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/newlib]
-+ --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
-+ case $ac_init_help in
-+ short | recursive ) echo "Configuration of newlib NEWLIB_VERSION:";;
-+ esac
-+ cat <<\_ACEOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-multilib build many library versions (default)
-+ --enable-target-optspace optimize for space
-+ --enable-malloc-debugging indicate malloc debugging requested
-+ --enable-newlib-multithread enable support for multiple threads
-+ --enable-newlib-iconv enable iconv library support
-+ --enable-newlib-elix-level supply desired elix library level (1-4)
-+ --disable-newlib-io-float disable printf/scanf family float support
-+ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
-+
-+_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" || continue
-+ ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-+ 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
-+newlib configure NEWLIB_VERSION
-+generated by GNU Autoconf 2.61
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 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
-+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 newlib $as_me NEWLIB_VERSION, which was
-+generated by GNU Autoconf 2.61. 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=.
-+ 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=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$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
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
-+ ;;
-+ esac
-+ done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_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=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ 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=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ 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 &&
-+ echo "$as_me: caught signal $ac_signal"
-+ 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'; { (exit 1); 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
-+
-+# 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
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
-+fi
-+shift
-+for ac_site_file
-+do
-+ if test -r "$ac_site_file"; then
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+ 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
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
-+ esac
-+ fi
-+else
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+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,)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,set)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+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
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
-+ fi;;
-+ esac
-+ # Pass precious variables to config.status.
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *\'*) ac_arg=$ac_var=`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.
-+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+ esac
-+ fi
-+done
-+if $ac_cache_corrupted; then
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { (exit 1); exit 1; }; }
-+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_aux_dir=
-+for ac_dir in ../../../.. "$srcdir"/../../../..; do
-+ if test -f "$ac_dir/install-sh"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install-sh -c"
-+ break
-+ elif test -f "$ac_dir/install.sh"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install.sh -c"
-+ break
-+ elif test -f "$ac_dir/shtool"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
-+ fi
-+done
-+if test -z "$ac_aux_dir"; then
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../../.. \"$srcdir\"/../../../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in ../../../.. \"$srcdir\"/../../../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+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 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+if test "${ac_cv_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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 &&
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { (exit 1); exit 1; }; }
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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
-+
-+
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+if test "${ac_cv_host+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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
-+
-+
-+am__api_version="1.4"
-+# 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.
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+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
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$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'
-+
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# 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 conftestfile 2> /dev/null`
-+ if test "$*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftestfile`
-+ fi
-+ if test "$*" != "X $srcdir/configure conftestfile" \
-+ && test "$*" != "X conftestfile $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".
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ test "$2" = conftestfile
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f conftest*
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}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 $. echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm -f conftest.sed
-+
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`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
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ SET_MAKE=
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+# Check whether --enable-multilib was given.
-+if test "${enable_multilib+set}" = set; then
-+ enableval=$enable_multilib; case "${enableval}" in
-+ yes) multilib=yes ;;
-+ no) multilib=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5
-+echo "$as_me: error: bad value ${enableval} for multilib option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ multilib=yes
-+fi
-+
-+# Check whether --enable-target-optspace was given.
-+if test "${enable_target_optspace+set}" = set; then
-+ enableval=$enable_target_optspace; case "${enableval}" in
-+ yes) target_optspace=yes ;;
-+ no) target_optspace=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for target-optspace option" >&5
-+echo "$as_me: error: bad value ${enableval} for target-optspace option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ target_optspace=
-+fi
-+
-+# Check whether --enable-malloc-debugging was given.
-+if test "${enable_malloc_debugging+set}" = set; then
-+ enableval=$enable_malloc_debugging; case "${enableval}" in
-+ yes) malloc_debugging=yes ;;
-+ no) malloc_debugging=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for malloc-debugging option" >&5
-+echo "$as_me: error: bad value ${enableval} for malloc-debugging option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ malloc_debugging=
-+fi
-+
-+# Check whether --enable-newlib-multithread was given.
-+if test "${enable_newlib_multithread+set}" = set; then
-+ enableval=$enable_newlib_multithread; case "${enableval}" in
-+ yes) newlib_multithread=yes ;;
-+ no) newlib_multithread=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-multithread option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-multithread option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_multithread=yes
-+fi
-+
-+# Check whether --enable-newlib-iconv was given.
-+if test "${enable_newlib_iconv+set}" = set; then
-+ enableval=$enable_newlib_iconv; if test "${newlib_iconv+set}" != set; then
-+ case "${enableval}" in
-+ yes) newlib_iconv=yes ;;
-+ no) newlib_iconv=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-iconv option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-iconv option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+ fi
-+else
-+ newlib_iconv=${newlib_iconv}
-+fi
-+
-+# Check whether --enable-newlib-elix-level was given.
-+if test "${enable_newlib_elix_level+set}" = set; then
-+ enableval=$enable_newlib_elix_level; case "${enableval}" in
-+ 0) newlib_elix_level=0 ;;
-+ 1) newlib_elix_level=1 ;;
-+ 2) newlib_elix_level=2 ;;
-+ 3) newlib_elix_level=3 ;;
-+ 4) newlib_elix_level=4 ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-elix-level option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-elix-level option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_elix_level=0
-+fi
-+
-+# Check whether --enable-newlib-io-float was given.
-+if test "${enable_newlib_io_float+set}" = set; then
-+ enableval=$enable_newlib_io_float; case "${enableval}" in
-+ yes) newlib_io_float=yes ;;
-+ no) newlib_io_float=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-io-float option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-io-float option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_io_float=yes
-+fi
-+
-+# Check whether --enable-newlib-supplied-syscalls was given.
-+if test "${enable_newlib_supplied_syscalls+set}" = set; then
-+ enableval=$enable_newlib_supplied_syscalls; case "${enableval}" in
-+ yes) newlib_may_supply_syscalls=yes ;;
-+ no) newlib_may_supply_syscalls=no ;;
-+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-supplied-syscalls option" >&5
-+echo "$as_me: error: bad value ${enableval} for newlib-supplied-syscalls option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+else
-+ newlib_may_supply_syscalls=yes
-+fi
-+
-+
-+
-+if test x${newlib_may_supply_syscalls} = xyes; then
-+ MAY_SUPPLY_SYSCALLS_TRUE=
-+ MAY_SUPPLY_SYSCALLS_FALSE='#'
-+else
-+ MAY_SUPPLY_SYSCALLS_TRUE='#'
-+ MAY_SUPPLY_SYSCALLS_FALSE=
-+fi
-+
-+
-+test -z "${with_target_subdir}" && with_target_subdir=.
-+
-+if test "${srcdir}" = "."; then
-+ if test "${with_target_subdir}" != "."; then
-+ newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-+ else
-+ newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-+ fi
-+else
-+ newlib_basedir="${srcdir}/../../.."
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-+if test "${ac_cv_target+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+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}-
-+
-+
-+PACKAGE=newlib
-+
-+VERSION=1.14.0.atmel.1.0.1
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+
-+
-+missing_dir=`cd $ac_aux_dir && pwd`
-+{ echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
-+echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ ACLOCAL=aclocal-${am__api_version}
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working autoconf" >&5
-+echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOCONF=autoconf
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOCONF="$missing_dir/missing autoconf"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
-+echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOMAKE=automake-${am__api_version}
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working autoheader" >&5
-+echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOHEADER=autoheader
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ AUTOHEADER="$missing_dir/missing autoheader"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for working makeinfo" >&5
-+echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6; }
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf. Sigh.
-+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-+ MAKEINFO=makeinfo
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+else
-+ MAKEINFO="$missing_dir/missing makeinfo"
-+ { echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6; }
-+fi
-+
-+
-+
-+# FIXME: We temporarily define our own version of AC_PROG_CC. This is
-+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
-+# are probably using a cross compiler, which will not be able to fully
-+# link an executable. This should really be fixed in autoconf
-+# itself.
-+
-+
-+
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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="gcc"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+ test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
-+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+#AC_PROG_CC_GNU
-+
-+if test $ac_cv_c_compiler_gnu = yes; then
-+ GCC=yes
-+ ac_test_CFLAGS="${CFLAGS+set}"
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+# AC_PROG_CC_G
-+ if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+ elif test $ac_cv_prog_cc_g = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-O2"
-+ fi
-+else
-+ GCC=
-+ test "${CFLAGS+set}" = set || CFLAGS="-g"
-+fi
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}as; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$AS"; then
-+ ac_cv_prog_AS="$AS" # 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_AS="${ac_tool_prefix}as"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AS=$ac_cv_prog_AS
-+if test -n "$AS"; then
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_AS"; then
-+ ac_ct_AS=$AS
-+ # Extract the first word of "as", so it can be a program name with args.
-+set dummy as; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_AS"; then
-+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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_AS="as"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AS=$ac_cv_prog_ac_ct_AS
-+if test -n "$ac_ct_AS"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_AS" = x; then
-+ AS=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
-+else
-+ AS="$ac_cv_prog_AS"
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
-+else
-+ AR="$ac_cv_prog_AR"
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ echo "$as_me:$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
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+
-+# 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.
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+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
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$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'
-+
-+
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&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
-+
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$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
-+
-+
-+
-+# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-+# at least currently, we never actually build a program, so we never
-+# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-+# fails, because we are probably configuring with a cross compiler
-+# which can't create executables. So we include AC_EXEEXT to keep
-+# automake happy, but we don't execute it, since we don't care about
-+# the result.
-+#if false; then
-+#
-+#fi
-+
-+. ${newlib_basedir}/configure.host
-+
-+newlib_cflags="${newlib_cflags} -fno-builtin"
-+
-+NEWLIB_CFLAGS=${newlib_cflags}
-+
-+
-+LDFLAGS=${ldflags}
-+
-+
-+
-+
-+if test x${newlib_elix_level} = x0; then
-+ ELIX_LEVEL_0_TRUE=
-+ ELIX_LEVEL_0_FALSE='#'
-+else
-+ ELIX_LEVEL_0_TRUE='#'
-+ ELIX_LEVEL_0_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x1; then
-+ ELIX_LEVEL_1_TRUE=
-+ ELIX_LEVEL_1_FALSE='#'
-+else
-+ ELIX_LEVEL_1_TRUE='#'
-+ ELIX_LEVEL_1_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x2; then
-+ ELIX_LEVEL_2_TRUE=
-+ ELIX_LEVEL_2_FALSE='#'
-+else
-+ ELIX_LEVEL_2_TRUE='#'
-+ ELIX_LEVEL_2_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x3; then
-+ ELIX_LEVEL_3_TRUE=
-+ ELIX_LEVEL_3_FALSE='#'
-+else
-+ ELIX_LEVEL_3_TRUE='#'
-+ ELIX_LEVEL_3_FALSE=
-+fi
-+
-+
-+if test x${newlib_elix_level} = x4; then
-+ ELIX_LEVEL_4_TRUE=
-+ ELIX_LEVEL_4_FALSE='#'
-+else
-+ ELIX_LEVEL_4_TRUE='#'
-+ ELIX_LEVEL_4_FALSE=
-+fi
-+
-+
-+
-+if test x${use_libtool} = xyes; then
-+ USE_LIBTOOL_TRUE=
-+ USE_LIBTOOL_FALSE='#'
-+else
-+ USE_LIBTOOL_TRUE='#'
-+ USE_LIBTOOL_FALSE=
-+fi
-+
-+# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we
-+# use oext, which is set in configure.host based on the target platform.
-+OBJEXT=${oext}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files Makefile"
-+
-+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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_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" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-+ cat confcache >$cache_file
-+ else
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+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}'
-+
-+# Transform confdefs.h into DEFS.
-+# Protect against shell expansion while executing Makefile rules.
-+# Protect against Makefile macro expansion.
-+#
-+# If the first sed substitution is executed (which looks for macros that
-+# take arguments), then branch to the quote section. Otherwise,
-+# look for a macro that doesn't take arguments.
-+ac_script='
-+t clear
-+:clear
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-+t quote
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-+t quote
-+b any
-+:quote
-+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-+s/\[/\\&/g
-+s/\]/\\&/g
-+s/\$/$$/g
-+H
-+:any
-+${
-+ g
-+ s/^\n//
-+ s/\n/ /g
-+ p
-+}
-+'
-+DEFS=`sed -n "$ac_script" confdefs.h`
-+
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; 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=`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.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $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}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## 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=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+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
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # scripts with optimization help from Paolo Bonzini. 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" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); 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
-+}
-+
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+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
-+fi
-+echo >conf$$.file
-+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
-+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=:
-+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
-+
-+# 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 newlib $as_me NEWLIB_VERSION, which was
-+generated by GNU Autoconf 2.61. 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
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number and configuration settings, then exit
-+ -q, --quiet 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
-+
-+Configuration files:
-+$config_files
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+newlib config.status NEWLIB_VERSION
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2006 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'
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+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 )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ $ac_shift
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ ac_need_defaults=false;;
-+ --he | --h | --help | --hel | -h )
-+ 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.
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$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
-+if \$ac_cs_recheck; then
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+ case $ac_config_target in
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ 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
-+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 '{ (exit 1); 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")
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+}
-+
-+#
-+# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+MAY_SUPPLY_SYSCALLS_TRUE!$MAY_SUPPLY_SYSCALLS_TRUE$ac_delim
-+MAY_SUPPLY_SYSCALLS_FALSE!$MAY_SUPPLY_SYSCALLS_FALSE$ac_delim
-+newlib_basedir!$newlib_basedir$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+CC!$CC$ac_delim
-+AS!$AS$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+NEWLIB_CFLAGS!$NEWLIB_CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+ELIX_LEVEL_0_TRUE!$ELIX_LEVEL_0_TRUE$ac_delim
-+ELIX_LEVEL_0_FALSE!$ELIX_LEVEL_0_FALSE$ac_delim
-+ELIX_LEVEL_1_TRUE!$ELIX_LEVEL_1_TRUE$ac_delim
-+ELIX_LEVEL_1_FALSE!$ELIX_LEVEL_1_FALSE$ac_delim
-+ELIX_LEVEL_2_TRUE!$ELIX_LEVEL_2_TRUE$ac_delim
-+ELIX_LEVEL_2_FALSE!$ELIX_LEVEL_2_FALSE$ac_delim
-+ELIX_LEVEL_3_TRUE!$ELIX_LEVEL_3_TRUE$ac_delim
-+ELIX_LEVEL_3_FALSE!$ELIX_LEVEL_3_FALSE$ac_delim
-+ELIX_LEVEL_4_TRUE!$ELIX_LEVEL_4_TRUE$ac_delim
-+ELIX_LEVEL_4_FALSE!$ELIX_LEVEL_4_FALSE$ac_delim
-+USE_LIBTOOL_TRUE!$USE_LIBTOOL_TRUE$ac_delim
-+USE_LIBTOOL_FALSE!$USE_LIBTOOL_FALSE$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+oext!$oext$ac_delim
-+aext!$aext$ac_delim
-+libm_machine_dir!$libm_machine_dir$ac_delim
-+machine_dir!$machine_dir$ac_delim
-+sys_dir!$sys_dir$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_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
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[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 ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$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 "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ 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 ||
-+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"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+ as_dirs=
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+ ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# 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=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ 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
-+ sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;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
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-+
-+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"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+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
-+ ;;
-+
-+
-+
-+ esac
-+
-+done # for ac_tag
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# 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 || { (exit 1); exit 1; }
-+fi
-+
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/configure.in newlib-1.17.0-new/newlib/libc/sys/avr32/configure.in
---- newlib-1.17.0/newlib/libc/sys/avr32/configure.in 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/configure.in 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,13 @@
-+dnl This is the newlib/libc/sys/avr32 configure.in file.
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ(2.59)
-+AC_INIT([newlib],[NEWLIB_VERSION])
-+
-+dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-+AC_CONFIG_AUX_DIR(../../../..)
-+
-+NEWLIB_CONFIGURE(../../..)
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/crt0.S newlib-1.17.0-new/newlib/libc/sys/avr32/crt0.S
---- newlib-1.17.0/newlib/libc/sys/avr32/crt0.S 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/crt0.S 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,83 @@
-+
-+ .section .reset,"ax"
-+
-+ .global _start
-+ .type _start,@function
-+_start:
-+ /* Jump to wherever the linker thinks we are... */
-+ lddpc pc, .Ltext_vaddr
-+
-+ .align 2
-+.Ltext_vaddr:
-+ .word _stext
-+
-+ .text
-+ .global _stext
-+_stext:
-+ /* Zero marks the end of the outermost frame. */
-+ mov r7, 0
-+
-+ /* Set up the stack pointer to a fixed value */
-+ lda.w r10, _estack
-+
-+ /* If _stack is -1 don't set sp, the stack is then probably
-+ set by some other means i.e. by a bootloader. */
-+ cp r10, -1
-+ movne sp, r10
-+
-+ /* Copy the data segment into RAM if necessary. If data_lma
-+ is equal to data then VMA==LMA and no copying is necessary.
-+ The linker script must make sure that the data segment is at
-+ least dword-aligned. */
-+ lda.w r11, _data_lma
-+ lda.w r12, _data
-+ cp.w r11, r12
-+ breq 1f
-+ lda.w r10, _edata
-+2: ld.d r8, r11++
-+ st.d r12++, r8
-+ cp.w r12, r10
-+ brlt 2b
-+
-+ /* Zero the memory in the .bss section. */
-+1: lda.w r10, _end
-+ lda.w r12, _edata
-+
-+ mov r8, 0
-+ mov r9, 0
-+2: st.d r12++, r8
-+ cp.w r12, r10
-+ brlt 2b
-+
-+ /* User dependent initialization */
-+ call _init_startup
-+
-+ /* Register _fini function with atexit
-+ The _fini function is responsible for calling destructiors */
-+ lda.w r12, _fini
-+ call atexit
-+
-+ /* Call _init in order to initialize constructors etc */
-+ call _init
-+
-+ /*Initialize argv, use stack for keeping arguments.
-+ _init_argv() returns argc in r12 and argv in r11
-+ and the total size used for the arguments in r10.*/
-+ mov r12, sp
-+ /* Signal that we are storing the arguments in a stackwise
-+ top down approach. */
-+ mov r11, 0
-+ call _init_argv
-+ /* If initialization if argv is not handled then _init_argv
-+ returns -1 so set argc to 0 and make sure no space is
-+ allocated on the stack. */
-+ cp.w r12, -1
-+ moveq r12, 0
-+ moveq r10, 0
-+ sub sp, r10
-+
-+ /* Call main and call exit when it returns */
-+ call main
-+ call exit
-+
-+ .weak _data_lma
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/Makefile.am newlib-1.17.0-new/newlib/libc/sys/avr32/Makefile.am
---- newlib-1.17.0/newlib/libc/sys/avr32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/Makefile.am 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,18 @@
-+## Process this file with automake to generate Makefile.in
-+
-+AUTOMAKE_OPTIONS = cygnus
-+
-+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-+
-+AM_CCASFLAGS = $(INCLUDES)
-+
-+noinst_LIBRARIES = lib.a
-+
-+lib_a_SOURCES = syscalls.c setjmp.S
-+lib_a_CCASFLAGS = $(AM_CCASFLAGS)
-+lib_a_CFLAGS = $(AM_CFLAGS)
-+
-+all: crt0.o
-+
-+ACLOCAL_AMFLAGS = -I ../../..
-+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/Makefile.in newlib-1.17.0-new/newlib/libc/sys/avr32/Makefile.in
---- newlib-1.17.0/newlib/libc/sys/avr32/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/Makefile.in 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,329 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = .
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
-+host_alias = @host_alias@
-+host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
-+AR = @AR@
-+AS = @AS@
-+CC = @CC@
-+CPP = @CPP@
-+EXEEXT = @EXEEXT@
-+LDFLAGS = @LDFLAGS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+VERSION = @VERSION@
-+aext = @aext@
-+libm_machine_dir = @libm_machine_dir@
-+machine_dir = @machine_dir@
-+newlib_basedir = @newlib_basedir@
-+oext = @oext@
-+sys_dir = @sys_dir@
-+
-+AUTOMAKE_OPTIONS = cygnus
-+
-+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-+
-+noinst_LIBRARIES = lib.a
-+
-+lib_a_SOURCES = syscalls.c setjmp.S
-+
-+ACLOCAL_AMFLAGS = -I ../../..
-+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir)
-+CPPFLAGS =
-+LIBS = @LIBS@
-+lib_a_LIBADD =
-+lib_a_OBJECTS = syscalls.o setjmp.o
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = gtar
-+GZIP_ENV = --best
-+SOURCES = $(lib_a_SOURCES)
-+OBJECTS = $(lib_a_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .o .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-+
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in \
-+ ../../../acinclude.m4 ../../../aclocal.m4 \
-+ ../../../libtool.m4
-+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ $(SHELL) ./config.status --recheck
-+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+ cd $(srcdir) && $(AUTOCONF)
-+
-+mostlyclean-noinstLIBRARIES:
-+
-+clean-noinstLIBRARIES:
-+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+
-+distclean-noinstLIBRARIES:
-+
-+maintainer-clean-noinstLIBRARIES:
-+
-+.c.o:
-+ $(COMPILE) -c $<
-+
-+.s.o:
-+ $(COMPILE) -c $<
-+
-+.S.o:
-+ $(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+ -rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-+ -rm -f lib.a
-+ $(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-+ $(RANLIB) lib.a
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ here=`pwd` && cd $(srcdir) \
-+ && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+ -rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration. Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+ -rm -rf $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-+ mkdir $(distdir)/=build
-+ mkdir $(distdir)/=inst
-+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
-+ cd $(distdir)/=build \
-+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist
-+ -rm -rf $(distdir)
-+ @banner="$(distdir).tar.gz is ready for distribution"; \
-+ dashes=`echo "$$banner" | sed s/./=/g`; \
-+ echo "$$dashes"; \
-+ echo "$$banner"; \
-+ echo "$$dashes"
-+dist: distdir
-+ -chmod -R a+r $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ -rm -rf $(distdir)
-+dist-all: distdir
-+ -chmod -R a+r $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ -rm -rf $(distdir)
-+distdir: $(DISTFILES)
-+ -rm -rf $(distdir)
-+ mkdir $(distdir)
-+ -chmod 777 $(distdir)
-+ @for file in $(DISTFILES); do \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ if test -d $$d/$$file; then \
-+ cp -pr $$d/$$file $(distdir)/$$file; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+ || cp -p $$d/$$file $(distdir)/$$file || :; \
-+ fi; \
-+ done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am:
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-info-am:
-+install-info: install-info-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
-+ mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-+ mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am: distclean-noinstLIBRARIES distclean-compile \
-+ distclean-tags distclean-generic clean-am
-+
-+distclean: distclean-am
-+ -rm -f config.status
-+
-+maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
-+ maintainer-clean-compile maintainer-clean-tags \
-+ maintainer-clean-generic distclean-am
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f config.status
-+
-+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck install-info-am install-info \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+all: crt0.o
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/setjmp.S newlib-1.17.0-new/newlib/libc/sys/avr32/setjmp.S
---- newlib-1.17.0/newlib/libc/sys/avr32/setjmp.S 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/setjmp.S 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,20 @@
-+ .text
-+ .globl setjmp
-+setjmp:
-+ stm r12, r0, r1, r2, r3, r4, r5, r6, r7, sp, lr
-+ retal 0
-+
-+ .globl longjmp
-+longjmp:
-+ ldm r12, r0, r1, r2, r3, r4, r5, r6, r7, sp, lr
-+ /* Put the return value into the integer result register.
-+ But if it is zero then return 1 instead. */
-+ cp r11, 0
-+ reteq 1
-+ retal r11
-+
-+
-+
-+
-+
-+
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/sys/sysregs.h newlib-1.17.0-new/newlib/libc/sys/avr32/sys/sysregs.h
---- newlib-1.17.0/newlib/libc/sys/avr32/sys/sysregs.h 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/sys/sysregs.h 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,158 @@
-+#ifndef __ASM_AVR32_SYSREGS_H
-+#define __ASM_AVR32_SYSREGS_H
-+
-+#define SYSREG_SR 0
-+#define SYSREG_EVBA 4
-+#define SYSREG_ACBA 8
-+#define SYSREG_CPUCR 12
-+#define SYSREG_ECR 16
-+#define SYSREG_RSR_SUP 20
-+#define SYSREG_RSR_INT0 24
-+#define SYSREG_RSR_INT1 28
-+#define SYSREG_RSR_INT2 32
-+#define SYSREG_RSR_INT3 36
-+#define SYSREG_RSR_EX 40
-+#define SYSREG_RSR_NMI 44
-+#define SYSREG_RSR_DBG 48
-+#define SYSREG_RAR_SUP 52
-+#define SYSREG_RAR_INT0 56
-+#define SYSREG_RAR_INT1 60
-+#define SYSREG_RAR_INT2 64
-+#define SYSREG_RAR_INT3 68
-+#define SYSREG_RAR_EX 72
-+#define SYSREG_RAR_NMI 76
-+#define SYSREG_RAR_DBG 80
-+#define SYSREG_JECR 84
-+#define SYSREG_JOSP 88
-+#define SYSREG_JAVA_LV0 92
-+#define SYSREG_JAVA_LV1 96
-+#define SYSREG_JAVA_LV2 100
-+#define SYSREG_JAVA_LV3 104
-+#define SYSREG_JAVA_LV4 108
-+#define SYSREG_JAVA_LV5 112
-+#define SYSREG_JAVA_LV6 116
-+#define SYSREG_JAVA_LV7 120
-+#define SYSREG_JTBA 124
-+#define SYSREG_JBCR 128
-+
-+#define SYSREG_CONFIG0 256
-+#define SYSREG_CONFIG1 260
-+#define SYSREG_COUNT 264
-+#define SYSREG_COMPARE 268
-+
-+#define SYSREG_BEAR 316
-+
-+/* MMU interface registers */
-+#define SYSREG_TLBEHI 272
-+#define SYSREG_TLBELO 276
-+#define SYSREG_PTBR 280
-+#define SYSREG_TLBEAR 284
-+#define SYSREG_MMUCR 288
-+#define SYSREG_TLBARLO 292
-+#define SYSREG_TLBDRLO 296
-+#define SYSREG_TLBARHI 300
-+#define SYSREG_TLBDRHI 304
-+
-+/* Performance counter */
-+#define SYSREG_PCCR 320
-+
-+ // Status register bits
-+#define SR_C_OFFSET 0
-+#define SR_Z_OFFSET 1
-+#define SR_N_OFFSET 2
-+#define SR_V_OFFSET 3
-+#define SR_Q_OFFSET 4
-+#define SR_T_OFFSET 14
-+#define SR_R_OFFSET 15
-+#define SR_GM_OFFSET 16
-+#define SR_I0M_OFFSET 17
-+#define SR_I1M_OFFSET 18
-+#define SR_I2M_OFFSET 19
-+#define SR_I3M_OFFSET 20
-+#define SR_EM_OFFSET 21
-+#define SR_M0_OFFSET 22
-+#define SR_M1_OFFSET 23
-+#define SR_M2_OFFSET 24
-+#define SR_D_OFFSET 26
-+#define SR_DM_OFFSET 27
-+#define SR_J_OFFSET 28
-+
-+#define SR_C (1 << 0)
-+#define SR_Z (1 << 1)
-+#define SR_N (1 << 2)
-+#define SR_V (1 << 3)
-+#define SR_Q (1 << 4)
-+#define SR_T (1 << 14)
-+#define SR_R (1 << 15)
-+#define SR_GM (1 << 16)
-+#define SR_I0M (1 << 17)
-+#define SR_I1M (1 << 18)
-+#define SR_I2M (1 << 19)
-+#define SR_I3M (1 << 20)
-+#define SR_EM (1 << 21)
-+#define SR_M0 (1 << 22)
-+#define SR_M1 (1 << 23)
-+#define SR_M2 (1 << 24)
-+#define SR_D (1 << 26)
-+#define SR_DM (1 << 27)
-+#define SR_J (1 << 28)
-+
-+//PCCR bits
-+#define PCCRS (1<<3)
-+#define PCCRC (1<<2)
-+#define PCCRR (1<<1)
-+#define PCCRE (1<<0)
-+#define PCCNT_PRESCALE 64
-+
-+//TLBEHI bits
-+#define TLBEHIVPN (1<<10)
-+#define TLBEHIV (1<<9)
-+#define TLBEHII (1<<0)
-+
-+//TLBELO = bits
-+#define TLBELOPFN (1<<10)
-+#define TLBELOC (1<<9)
-+#define TLBELOG (1<<8)
-+#define TLBELOB (1<<7)
-+#define TLBELOAP (1<<5)
-+#define TLBELOSZ (1<<2)
-+#define TLBELOD (1<<1)
-+#define TLBELOW (1<<0)
-+
-+//MMUCR bits
-+#define MMUIRP (1<<26)
-+#define MMUILA (1<<20)
-+#define MMUDRP (1<<14)
-+#define MMUDLA (1<<8)
-+#define MMUS (1<<4)
-+#define MMUN (1<<3)
-+#define MMUI (1<<2)
-+#define MMUM (1<<1)
-+#define MMUE (1<<0)
-+
-+// Relative offsets to EVBA
-+#define H_UNREC_EX 0x000
-+#define H_TLB_MH 0x004
-+#define H_BUS_ERR_D 0x008
-+#define H_BUS_ERR_I 0x00C
-+#define H_NMI 0x010
-+#define H_INST_ADDR 0x014
-+#define H_ITLB_MISS 0x050
-+#define H_ITLB_PROT 0x018
-+#define H_DEBUG 0x01C
-+#define H_ILL_OPC 0x020
-+#define H_UNIMPL_INST 0x024
-+#define H_PRIV_VIOL 0x028
-+#define H_FLOAT_PT 0x02C
-+#define H_COPROC_ABS 0x030
-+#define H_SCALL 0x100
-+#define H_DATA_ADDR_R 0x034
-+#define H_DATA_ADDR_W 0x038
-+#define H_DTLB_MISS_R 0x060
-+#define H_DTLB_MISS_W 0x070
-+#define H_DTLB_PROT_R 0x03C
-+#define H_DTLB_PROT_W 0x040
-+#define H_DTLB_MOD 0x044
-+
-+
-+#endif /* __ASM_AVR32_SYSREGS_H */
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/syscalls.c newlib-1.17.0-new/newlib/libc/sys/avr32/syscalls.c
---- newlib-1.17.0/newlib/libc/sys/avr32/syscalls.c 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/syscalls.c 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,234 @@
-+#include "syscalls.h"
-+#include "sys/sysregs.h"
-+#include <sys/times.h>
-+#include <sys/time.h>
-+#include <stdio.h>
-+#include <errno.h>
-+
-+int __attribute__((weak))
-+ _init_startup ()
-+{
-+ return 0;
-+}
-+
-+
-+clock_t __attribute__((weak))
-+ _times( struct tms *tms )
-+{
-+ int tick;
-+ tick = __builtin_mfsr(SYSREG_COUNT);
-+ tms->tms_utime = 0;
-+ tms->tms_stime = tick;
-+ tms->tms_cutime = 0;
-+ tms->tms_cstime = 0;
-+ return tick;
-+}
-+
-+extern void __heap_start__, __heap_end__;
-+
-+void * __attribute__((weak))
-+ _sbrk(int increment)
-+{
-+ static void *cur_heap_pos = 0;
-+
-+ //Initialize cur_heap_pos
-+ if ( cur_heap_pos == 0 )
-+ cur_heap_pos = &__heap_start__;
-+
-+ if ( (cur_heap_pos + increment) <= &__heap_end__ ){
-+ void *heap_pos = cur_heap_pos;
-+ cur_heap_pos += increment;
-+ return heap_pos;
-+ } else {
-+#ifdef DEBUG_MSG_ON
-+ fprintf(stderr, "Warning: Heap is running full trying to allocate %i bytes!!!!\n", increment);
-+ fprintf(stderr, "\tHeap start address\t= 0x%x\n", &__heap_start__);
-+ fprintf(stderr, "\tHeap end address\t= 0x%x\n", &__heap_end__);
-+ fprintf(stderr, "\tCurrent heap address\t= 0x%x\n", cur_heap_pos);
-+ fflush(stderr);
-+#endif
-+ errno = ENOMEM;
-+ return (void *)-1;
-+ }
-+ return (void *)-1;
-+}
-+
-+void __attribute__((weak,naked))
-+ _init_argv (void *arg_mem_top)
-+{
-+ T2H_SYSCALL(T2H_SYSCALL_INIT_ARGV);
-+ T2H_SYSCALL_RETURN();
-+}
-+
-+void __attribute__((weak,naked))
-+ _exit( int code )
-+{
-+ T2H_SYSCALL(T2H_SYSCALL_EXIT);
-+ while (1);
-+}
-+
-+int __attribute__((weak,naked))
-+ _open (char *pathname, int flags, int mode)
-+{
-+ T2H_SYSCALL(T2H_SYSCALL_OPEN);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak,naked))
-+ _close (int file)
-+{
-+ T2H_SYSCALL(T2H_SYSCALL_CLOSE);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak,naked))
-+ _lseek( int filedes, int offset, int whence )
-+{
-+ T2H_SYSCALL(T2H_SYSCALL_LSEEK);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+
-+int __attribute__((weak,naked))
-+ _read (int file,
-+ char * ptr,
-+ int len){
-+ T2H_SYSCALL(T2H_SYSCALL_READ);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak,naked))
-+ _write (int file,
-+ char * ptr,
-+ int len){
-+ T2H_SYSCALL(T2H_SYSCALL_WRITE);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak,naked))
-+ isatty (int desc){
-+ T2H_SYSCALL(T2H_SYSCALL_ISATTY);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+static void _convert_host2target_stat(struct stat *target_stat, struct host_stat *host_stat)
-+{
-+ target_stat->st_dev = (dev_t)host_stat->st_dev;
-+ target_stat->st_ino = (ino_t)host_stat->st_ino;
-+ target_stat->st_mode = (mode_t)host_stat->st_mode;
-+ target_stat->st_nlink = (nlink_t)host_stat->st_nlink;
-+ target_stat->st_uid = (uid_t)host_stat->st_uid;
-+ target_stat->st_gid = (gid_t)host_stat->st_gid;
-+ target_stat->st_rdev = (dev_t)host_stat->st_rdev;
-+ target_stat->st_size = (off_t)host_stat->st_size;
-+ target_stat->st_blksize = (long)host_stat->st_blksize;
-+ target_stat->st_blocks = (long)host_stat->st_blocks;
-+ target_stat->st_atime = (time_t)host_stat->st_atime;
-+ target_stat->st_mtime = (time_t)host_stat->st_mtime;
-+ target_stat->st_ctime = (time_t)host_stat->st_ctime;
-+}
-+
-+int __attribute__((naked))
-+ _fstat_host (int filedes, struct host_stat *ptr){
-+ T2H_SYSCALL(T2H_SYSCALL_FSTAT);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((naked))
-+ _stat_host (const char *filename, struct host_stat *ptr){
-+ T2H_SYSCALL(T2H_SYSCALL_STAT);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak))
-+ _fstat (int filedes, struct stat *stat){
-+ struct host_stat host_stat;
-+ if ( _fstat_host (filedes, &host_stat) < 0 )
-+ return -1;
-+ _convert_host2target_stat (stat, &host_stat);
-+ return 0;
-+}
-+
-+int __attribute__((weak))
-+ _stat (const char *filename, struct stat *stat){
-+ struct host_stat host_stat;
-+ if ( _stat_host (filename, &host_stat) < 0)
-+ return -1;
-+ _convert_host2target_stat (stat, &host_stat);
-+ return 0;
-+}
-+
-+
-+int __attribute__((naked))
-+ _gettimeofday_host (struct host_timeval *tv, struct timezone *tz){
-+ T2H_SYSCALL(T2H_SYSCALL_GETTIMEOFDAY);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak))
-+ _gettimeofday (struct timeval *tv, struct timezone *tz){
-+ struct host_timeval host_tv;
-+ if ( _gettimeofday_host (&host_tv, tz) < 0 )
-+ return -1;
-+ tv->tv_sec = (long)host_tv.tv_sec;
-+ tv->tv_usec = (long)host_tv.tv_usec;
-+ return 0;
-+}
-+
-+int __attribute__((weak,naked))
-+ _unlink (const char *path){
-+ T2H_SYSCALL(T2H_SYSCALL_UNLINK);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak,naked))
-+ _system (const char *command){
-+ T2H_SYSCALL(T2H_SYSCALL_SYSTEM);
-+ T2H_SYSCALL_CHECK_ERROR_AND_RETURN();
-+}
-+
-+int __attribute__((weak))
-+ _execve (){
-+ return -1;
-+}
-+
-+
-+int __attribute__((weak))
-+ _fork (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ _wait (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ sigfillset (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ sigprocmask (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ _fcntl (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ _link (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ _kill (){
-+ return -1;
-+}
-+
-+int __attribute__((weak))
-+ _getpid (){
-+ return -1;
-+}
-diff -Naur newlib-1.17.0/newlib/libc/sys/avr32/syscalls.h newlib-1.17.0-new/newlib/libc/sys/avr32/syscalls.h
---- newlib-1.17.0/newlib/libc/sys/avr32/syscalls.h 1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/avr32/syscalls.h 2009-05-22 09:57:50.000000000 +0200
-@@ -0,0 +1,72 @@
-+#ifndef __SYSCALLS_H__
-+#define __SYSCALLS_H__
-+
-+#include <sys/stat.h>
-+#include <errno.h>
-+
-+struct host_stat {
-+ unsigned int st_dev; /* device */
-+ unsigned int st_ino; /* inode */
-+ mode_t st_mode; /* protection */
-+ unsigned int st_nlink; /* number of hard links */
-+ unsigned int st_uid; /* user ID of owner */
-+ unsigned int st_gid; /* group ID of owner */
-+ unsigned int st_rdev; /* device type (if inode device) */
-+ unsigned long long st_size; /* total size, in bytes */
-+ unsigned long long st_blksize; /* blocksize for filesystem I/O */
-+ unsigned long long st_blocks; /* number of blocks allocated */
-+ time_t st_atime; /* time of last access */
-+ time_t st_mtime; /* time of last modification */
-+ time_t st_ctime; /* time of last change */
-+};
-+
-+struct host_timeval {
-+ time_t tv_sec;
-+ long long tv_usec;
-+};
-+
-+
-+#define T2H_SYSCALL_OPEN 1
-+#define T2H_SYSCALL_CLOSE 2
-+#define T2H_SYSCALL_READ 3
-+#define T2H_SYSCALL_WRITE 4
-+#define T2H_SYSCALL_LSEEK 5
-+#define T2H_SYSCALL_RENAME 6
-+#define T2H_SYSCALL_UNLINK 7
-+#define T2H_SYSCALL_STAT 8
-+#define T2H_SYSCALL_FSTAT 9
-+#define T2H_SYSCALL_GETTIMEOFDAY 10
-+#define T2H_SYSCALL_ISATTY 11
-+#define T2H_SYSCALL_SYSTEM 12
-+#define T2H_SYSCALL_EXIT 13
-+#define T2H_SYSCALL_INIT_ARGV 14
-+
-+
-+/* The breakpoint/mov r12,-1/mov r11,... pattern causes
-+ the debugger to be able to recognize the system call.
-+ If the debug system is not enabled then the breakpoint
-+ is executed as a nop and r12 set to -1 and errno to
-+ ENOSYS. The debugger is responsible for setting r12
-+ and r11 and skipping the instructions after the breakpoint
-+ which would otherwise set these registers.
-+*/
-+#define T2H_SYSCALL(syscall_code) \
-+ asm ("mov r8, %0\n" \
-+ "breakpoint\n" \
-+ "mov r12, -1\n" \
-+ "mov r11, %1\n" \
-+ :: "i" (syscall_code), "i" (ENOSYS) );
-+
-+#define T2H_SYSCALL_CHECK_ERROR_AND_RETURN() \
-+ asm ("cp.w r12, 0\n" \
-+ "retge r12\n" \
-+ "lda.w r10, errno\n" \
-+ "st.w r10[0], r11\n" \
-+ "ret r12\n" \
-+ ".align 2\n" \
-+ ".cpool\n");
-+
-+#define T2H_SYSCALL_RETURN() \
-+ asm ("ret r12\n");
-+
-+#endif
-diff -Naur newlib-1.17.0/newlib/libc/sys/configure newlib-1.17.0-new/newlib/libc/sys/configure
---- newlib-1.17.0/newlib/libc/sys/configure 2008-12-22 20:45:49.000000000 +0100
-+++ newlib-1.17.0-new/newlib/libc/sys/configure 2009-05-22 09:57:50.000000000 +0200
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for newlib 1.17.0.
-+# Generated by GNU Autoconf 2.61 for newlib 1.17.0.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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 Bourne compatible
-+# 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- 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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+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
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +128,388 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# 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
-
--# 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
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
- fi
-
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- 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
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-
-- ;;
-- 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
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs 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_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf@gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); 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 sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- 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
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ 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'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+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=:
-@@ -222,7 +518,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+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'"
-@@ -231,15 +548,6 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
-
-
- # Check that we are running under the correct shell.
-@@ -390,29 +698,26 @@
-
-
-
-+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`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME='newlib'
- PACKAGE_TARNAME='newlib'
-@@ -424,66 +729,214 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--ac_subdirs_all="$ac_subdirs_all a29khif"
--ac_subdirs_all="$ac_subdirs_all arc"
--ac_subdirs_all="$ac_subdirs_all arm"
--ac_subdirs_all="$ac_subdirs_all d10v"
--ac_subdirs_all="$ac_subdirs_all decstation"
--ac_subdirs_all="$ac_subdirs_all h8300hms"
--ac_subdirs_all="$ac_subdirs_all h8500hms"
--ac_subdirs_all="$ac_subdirs_all linux"
--ac_subdirs_all="$ac_subdirs_all m88kbug"
--ac_subdirs_all="$ac_subdirs_all mmixware"
--ac_subdirs_all="$ac_subdirs_all netware"
--ac_subdirs_all="$ac_subdirs_all rdos"
--ac_subdirs_all="$ac_subdirs_all rtems"
--ac_subdirs_all="$ac_subdirs_all sh"
--ac_subdirs_all="$ac_subdirs_all sparc64"
--ac_subdirs_all="$ac_subdirs_all sun4"
--ac_subdirs_all="$ac_subdirs_all sysmec"
--ac_subdirs_all="$ac_subdirs_all sysnec810"
--ac_subdirs_all="$ac_subdirs_all sysnecv850"
--ac_subdirs_all="$ac_subdirs_all sysvi386"
--ac_subdirs_all="$ac_subdirs_all sysvnecv70"
--ac_subdirs_all="$ac_subdirs_all tic80"
--ac_subdirs_all="$ac_subdirs_all w65"
--ac_subdirs_all="$ac_subdirs_all z8ksim"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir SED DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL CFLAGS CPPFLAGS ac_ct_CC EXEEXT EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP subdirs CRT0 HAVE_SYS_DIR_TRUE HAVE_SYS_DIR_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+MAY_SUPPLY_SYSCALLS_TRUE
-+MAY_SUPPLY_SYSCALLS_FALSE
-+newlib_basedir
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+CC
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+AS
-+AR
-+RANLIB
-+READELF
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+CCAS
-+CCASFLAGS
-+NEWLIB_CFLAGS
-+LDFLAGS
-+ELIX_LEVEL_0_TRUE
-+ELIX_LEVEL_0_FALSE
-+ELIX_LEVEL_1_TRUE
-+ELIX_LEVEL_1_FALSE
-+ELIX_LEVEL_2_TRUE
-+ELIX_LEVEL_2_FALSE
-+ELIX_LEVEL_3_TRUE
-+ELIX_LEVEL_3_FALSE
-+ELIX_LEVEL_4_TRUE
-+ELIX_LEVEL_4_FALSE
-+USE_LIBTOOL_TRUE
-+USE_LIBTOOL_FALSE
-+OBJEXT
-+oext
-+aext
-+lpfx
-+libm_machine_dir
-+machine_dir
-+sys_dir
-+SED
-+DLLTOOL
-+OBJDUMP
-+LIBTOOL
-+CFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+GREP
-+EGREP
-+FGREP
-+LD
-+DUMPBIN
-+ac_ct_DUMPBIN
-+NM
-+LN_S
-+lt_ECHO
-+DSYMUTIL
-+NMEDIT
-+LIPO
-+OTOOL
-+OTOOL64
-+CPP
-+subdirs
-+CRT0
-+HAVE_SYS_DIR_TRUE
-+HAVE_SYS_DIR_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CCAS
-+CCASFLAGS
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP'
-+ac_subdirs_all='a29khif
-+arc
-+arm
-+avr32
-+d10v
-+decstation
-+h8300hms
-+h8500hms
-+linux
-+m88kbug
-+mmixware
-+netware
-+rdos
-+rtems
-+sh
-+sparc64
-+sun4
-+sysmec
-+sysnec810
-+sysnecv850
-+sysvi386
-+sysvnecv70
-+tic80
-+w65
-+z8ksim'
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -510,34 +963,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+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"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ 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_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -559,33 +1026,45 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- eval "enable_$ac_feature=no" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=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_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -612,6 +1091,12 @@
- -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 ;;
-@@ -636,13 +1121,16 @@
- | --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 | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -707,6 +1195,16 @@
- | --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 ;;
-@@ -759,24 +1257,20 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/-/_/g'`
-- eval "with_$ac_package=no" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -807,8 +1301,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -828,27 +1321,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+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=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -875,82 +1360,76 @@
- 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 .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # 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 its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-- { (exit 1); exit 1; }; }
-- fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CCAS_set=${CCAS+set}
--ac_env_CCAS_value=$CCAS
--ac_cv_env_CCAS_set=${CCAS+set}
--ac_cv_env_CCAS_value=$CCAS
--ac_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_env_CCASFLAGS_value=$CCASFLAGS
--ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
--ac_cv_env_CCASFLAGS_value=$CCASFLAGS
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-+ 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.
-@@ -979,9 +1458,6 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -999,15 +1475,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --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]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --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/newlib]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1044,10 +1527,8 @@
- --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-shared[=PKGS]
-- build shared libraries [default=yes]
-- --enable-static[=PKGS]
-- build static libraries [default=yes]
-+ --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)
-@@ -1066,128 +1547,95 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include 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
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ 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
-- # Check for guested configure; otherwise get Cygnus style 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
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ 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
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- newlib configure 1.17.0
--generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.61
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 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 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+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 newlib $as_me 1.17.0, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1206,7 +1654,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 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`
-@@ -1220,6 +1668,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1241,7 +1690,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1252,7 +1700,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1274,9 +1722,7 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1287,8 +1733,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# 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.
- {
-@@ -1301,20 +1747,34 @@
- _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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ 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"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1325,22 +1785,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1352,26 +1818,24 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-- ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1402,14 +1866,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1425,8 +1892,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1438,12 +1905,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+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"
-+ 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,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1468,8 +1934,7 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1486,12 +1951,6 @@
- { (exit 1); exit 1; }; }
- 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
--
-
-
-
-@@ -1516,67 +1975,92 @@
-
-
-
-+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
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in ../../.. "$srcdir"/../../..; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&5
--echo "$as_me: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. \"$srcdir\"/../../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in ../../.. \"$srcdir\"/../../.." >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# 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.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ 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 &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
-
-
- am__api_version="1.9"
-@@ -1593,8 +2077,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1616,7 +2100,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ 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.
-@@ -1635,21 +2119,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # 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 path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1659,8 +2144,8 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1702,20 +2187,20 @@
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+ 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"
-+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1767,8 +2252,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1781,54 +2266,57 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`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
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
-- eval ac_cv_prog_make_${ac_make}_set=yes
--else
-- eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -1843,7 +2331,7 @@
-
- DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
-@@ -1853,8 +2341,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -1881,15 +2369,15 @@
- fi
-
-
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
-- enableval="$enable_dependency_tracking"
-+ enableval=$enable_dependency_tracking;
-+fi
-
--fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-@@ -1907,10 +2395,9 @@
-
-
-
--# Check whether --enable-multilib or --disable-multilib was given.
-+# Check whether --enable-multilib was given.
- if test "${enable_multilib+set}" = set; then
-- enableval="$enable_multilib"
-- case "${enableval}" in
-+ enableval=$enable_multilib; case "${enableval}" in
- yes) multilib=yes ;;
- no) multilib=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5
-@@ -1919,11 +2406,11 @@
- esac
- else
- multilib=yes
--fi;
--# Check whether --enable-target-optspace or --disable-target-optspace was given.
-+fi
-+
-+# Check whether --enable-target-optspace was given.
- if test "${enable_target_optspace+set}" = set; then
-- enableval="$enable_target_optspace"
-- case "${enableval}" in
-+ enableval=$enable_target_optspace; case "${enableval}" in
- yes) target_optspace=yes ;;
- no) target_optspace=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for target-optspace option" >&5
-@@ -1932,11 +2419,11 @@
- esac
- else
- target_optspace=
--fi;
--# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-+fi
-+
-+# Check whether --enable-malloc-debugging was given.
- if test "${enable_malloc_debugging+set}" = set; then
-- enableval="$enable_malloc_debugging"
-- case "${enableval}" in
-+ enableval=$enable_malloc_debugging; case "${enableval}" in
- yes) malloc_debugging=yes ;;
- no) malloc_debugging=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for malloc-debugging option" >&5
-@@ -1945,11 +2432,11 @@
- esac
- else
- malloc_debugging=
--fi;
--# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-+fi
-+
-+# Check whether --enable-newlib-multithread was given.
- if test "${enable_newlib_multithread+set}" = set; then
-- enableval="$enable_newlib_multithread"
-- case "${enableval}" in
-+ enableval=$enable_newlib_multithread; case "${enableval}" in
- yes) newlib_multithread=yes ;;
- no) newlib_multithread=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-multithread option" >&5
-@@ -1958,11 +2445,11 @@
- esac
- else
- newlib_multithread=yes
--fi;
--# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-+fi
-+
-+# Check whether --enable-newlib-iconv was given.
- if test "${enable_newlib_iconv+set}" = set; then
-- enableval="$enable_newlib_iconv"
-- if test "${newlib_iconv+set}" != set; then
-+ enableval=$enable_newlib_iconv; if test "${newlib_iconv+set}" != set; then
- case "${enableval}" in
- yes) newlib_iconv=yes ;;
- no) newlib_iconv=no ;;
-@@ -1973,11 +2460,11 @@
- fi
- else
- newlib_iconv=${newlib_iconv}
--fi;
--# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-+fi
-+
-+# Check whether --enable-newlib-elix-level was given.
- if test "${enable_newlib_elix_level+set}" = set; then
-- enableval="$enable_newlib_elix_level"
-- case "${enableval}" in
-+ enableval=$enable_newlib_elix_level; case "${enableval}" in
- 0) newlib_elix_level=0 ;;
- 1) newlib_elix_level=1 ;;
- 2) newlib_elix_level=2 ;;
-@@ -1989,11 +2476,11 @@
- esac
- else
- newlib_elix_level=0
--fi;
--# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-+fi
-+
-+# Check whether --enable-newlib-io-float was given.
- if test "${enable_newlib_io_float+set}" = set; then
-- enableval="$enable_newlib_io_float"
-- case "${enableval}" in
-+ enableval=$enable_newlib_io_float; case "${enableval}" in
- yes) newlib_io_float=yes ;;
- no) newlib_io_float=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-io-float option" >&5
-@@ -2002,11 +2489,11 @@
- esac
- else
- newlib_io_float=yes
--fi;
--# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-+fi
-+
-+# Check whether --enable-newlib-supplied-syscalls was given.
- if test "${enable_newlib_supplied_syscalls+set}" = set; then
-- enableval="$enable_newlib_supplied_syscalls"
-- case "${enableval}" in
-+ enableval=$enable_newlib_supplied_syscalls; case "${enableval}" in
- yes) newlib_may_supply_syscalls=yes ;;
- no) newlib_may_supply_syscalls=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for newlib-supplied-syscalls option" >&5
-@@ -2015,7 +2502,8 @@
- esac
- else
- newlib_may_supply_syscalls=yes
--fi;
-+fi
-+
-
-
- if test x${newlib_may_supply_syscalls} = xyes; then
-@@ -2041,26 +2529,41 @@
- fi
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ 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` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
-
-
-
-@@ -2113,8 +2616,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2127,32 +2630,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2165,27 +2670,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -2220,8 +2739,8 @@
-
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2234,30 +2753,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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="gcc"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2346,8 +2867,8 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-@@ -2366,8 +2887,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2381,7 +2902,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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
-@@ -2392,6 +2913,7 @@
- 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.
-@@ -2409,20 +2931,21 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
--echo "$as_me:$LINENO: checking whether we are using GNU C" >&5
--echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using GNU C" >&5
-+echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2442,8 +2965,8 @@
- ac_cv_c_compiler_gnu=no
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-
- if test $ac_cv_c_compiler_gnu = yes; then
- GCC=yes
-@@ -2452,13 +2975,16 @@
- CFLAGS=
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2474,38 +3000,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=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
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -2537,8 +3143,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2551,32 +3157,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2589,26 +3197,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AS=$ac_ct_AS
-+ if test "x$ac_ct_AS" = x; then
-+ AS=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
- else
- AS="$ac_cv_prog_AS"
- fi
-@@ -2616,8 +3239,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2630,32 +3253,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2668,26 +3293,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -2695,8 +3335,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2709,32 +3349,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2747,27 +3389,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -2775,8 +3431,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args.
- set dummy ${ac_tool_prefix}readelf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_READELF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2789,32 +3445,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_READELF="${ac_tool_prefix}readelf"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- READELF=$ac_cv_prog_READELF
- if test -n "$READELF"; then
-- echo "$as_me:$LINENO: result: $READELF" >&5
--echo "${ECHO_T}$READELF" >&6
-+ { echo "$as_me:$LINENO: result: $READELF" >&5
-+echo "${ECHO_T}$READELF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_READELF"; then
- ac_ct_READELF=$READELF
- # Extract the first word of "readelf", so it can be a program name with args.
- set dummy readelf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2827,27 +3485,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_READELF="readelf"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF=":"
- fi
- fi
- ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
- if test -n "$ac_ct_READELF"; then
-- echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
--echo "${ECHO_T}$ac_ct_READELF" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
-+echo "${ECHO_T}$ac_ct_READELF" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- READELF=$ac_ct_READELF
-+ if test "x$ac_ct_READELF" = x; then
-+ READELF=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ READELF=$ac_ct_READELF
-+ fi
- else
- READELF="$ac_cv_prog_READELF"
- fi
-@@ -2866,8 +3538,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2889,7 +3561,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ 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.
-@@ -2908,21 +3580,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # 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 path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2936,17 +3609,17 @@
- # Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */
- ac_given_INSTALL=$INSTALL
-
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+ # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- USE_MAINTAINER_MODE=$enableval
-+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
--fi;
-- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
- if test $USE_MAINTAINER_MODE = yes; then
-@@ -3066,64 +3739,89 @@
-
-
-
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
--if test "${lt_cv_path_SED+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-+if test "${ac_cv_path_SED+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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" | sed 99q >conftest.sed
-+ $as_unset ac_script || ac_script=
-+ # Extract the first word of "sed gsed" to use in msg output
-+if test -z "$SED"; then
-+set dummy sed gsed; ac_prog_name=$2
-+if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
-+ 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 lt_ac_prog in sed gsed; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-- fi
-- done
-- done
--done
--IFS=$as_save_IFS
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-- test ! -f $lt_ac_sed && continue
-- cat /dev/null > conftest.in
-- lt_ac_count=0
-- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-- # Check for GNU sed and select it if it is found.
-- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-- lt_cv_path_SED=$lt_ac_sed
-- break
-- fi
-- while true; do
-- cat conftest.in conftest.in >conftest.tmp
-- mv conftest.tmp conftest.in
-- cp conftest.in conftest.nl
-- echo >>conftest.nl
-- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-- cmp -s conftest.out conftest.nl || break
-- # 10000 chars as input seems more than enough
-- test $lt_ac_count -gt 10 && break
-- lt_ac_count=`expr $lt_ac_count + 1`
-- if test $lt_ac_count -gt $lt_ac_max; then
-- lt_ac_max=$lt_ac_count
-- lt_cv_path_SED=$lt_ac_sed
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
-+fi
-+
-+SED="$ac_cv_path_SED"
-+if test -z "$SED"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
--SED=$lt_cv_path_SED
-+else
-+ ac_cv_path_SED=$SED
-+fi
-
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
-+ SED="$ac_cv_path_SED"
-+ rm -f conftest.sed
-
- test -z "$SED" && SED=sed
- Xsed="$SED -e 1s/^X//"
-@@ -3146,8 +3844,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3160,32 +3858,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3198,27 +3898,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AS=$ac_ct_AS
-+ if test "x$ac_ct_AS" = x; then
-+ AS="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AS=$ac_ct_AS
-+ fi
- else
- AS="$ac_cv_prog_AS"
- fi
-@@ -3226,8 +3940,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3240,32 +3954,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--echo "${ECHO_T}$DLLTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3278,27 +3994,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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_DLLTOOL="dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
- fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- DLLTOOL=$ac_ct_DLLTOOL
-+ if test "x$ac_ct_DLLTOOL" = x; then
-+ DLLTOOL="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DLLTOOL=$ac_ct_DLLTOOL
-+ fi
- else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
- fi
-@@ -3306,8 +4036,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3320,32 +4050,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3358,27 +4090,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OBJDUMP=$ac_ct_OBJDUMP
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
-+ fi
- else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-@@ -3439,8 +4185,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3453,32 +4199,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3491,36 +4239,51 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&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.
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3533,98 +4296,59 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
-+ fi
- fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-+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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
--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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$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"
-+ 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"
- echo "$as_me:$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.
-@@ -3642,22 +4366,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3670,36 +4395,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3712,29 +4439,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -3747,21 +4490,35 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -3786,47 +4543,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # 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 | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-+ 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
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -3838,19 +4625,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3869,22 +4658,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -3895,9 +4689,8 @@
- 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 | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -3911,14 +4704,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3938,14 +4731,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ 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 ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -3963,12 +4762,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3991,50 +4790,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4050,38 +4848,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -4097,12 +4975,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4136,12 +5014,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ 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 -std1. */
-+ 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);};
-@@ -4156,205 +5039,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
-
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4363,8 +5098,8 @@
-
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4446,58 +5181,273 @@
- fi
- done
-
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_CC_dependencies_compiler_type=none
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$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
-+
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
- fi
-
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
--CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-
-
--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
- fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for fgrep" >&5
-+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_FGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-+ then ac_cv_path_FGREP="$GREP -F"
-+ else
-+ # Extract the first word of "fgrep" to use in msg output
-+if test -z "$FGREP"; then
-+set dummy fgrep; ac_prog_name=$2
-+if test "${ac_cv_path_FGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-+ 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
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ 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
-+ ac_count=`expr $ac_count + 1`
-+ 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
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-+FGREP="$ac_cv_path_FGREP"
-+if test -z "$FGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
--echo "$as_me:$LINENO: checking for fgrep" >&5
--echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
--if test "${ac_cv_prog_fgrep+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo 'ab*c' | (grep -F 'ab*c') >/dev/null 2>&1
-- then ac_cv_prog_fgrep='grep -F'
-- else ac_cv_prog_fgrep='fgrep'
-- fi
-+ ac_cv_path_FGREP=$FGREP
-+fi
-+
-+
-+ fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_fgrep" >&5
--echo "${ECHO_T}$ac_cv_prog_fgrep" >&6
-- FGREP=$ac_cv_prog_fgrep
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
-+ FGREP="$ac_cv_path_FGREP"
-
-
- test -z "$GREP" && GREP=grep
-@@ -4520,18 +5470,18 @@
-
-
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# 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
-+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
- with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -4560,11 +5510,11 @@
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4597,17 +5547,17 @@
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4621,8 +5571,8 @@
- ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-@@ -4633,8 +5583,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
--echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4682,8 +5632,8 @@
- : ${lt_cv_path_NM=no}
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
- else
-@@ -4693,8 +5643,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4707,25 +5657,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $DUMPBIN" >&5
--echo "${ECHO_T}$DUMPBIN" >&6
-+ { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+echo "${ECHO_T}$DUMPBIN" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$DUMPBIN" && break
- done
- fi
-@@ -4735,8 +5687,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4749,30 +5701,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
--echo "${ECHO_T}$ac_ct_DUMPBIN" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_DUMPBIN" && break
- done
--test -n "$ac_ct_DUMPBIN" || ac_ct_DUMPBIN=":"
-
-- DUMPBIN=$ac_ct_DUMPBIN
-+ if test "x$ac_ct_DUMPBIN" = x; then
-+ DUMPBIN=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DUMPBIN=$ac_ct_DUMPBIN
-+ fi
- fi
-
-
-@@ -4787,43 +5754,43 @@
-
-
-
--echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
--echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
- if test "${lt_cv_nm_interface+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4797: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5764: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4800: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5767: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4803: output\"" >&5)
-+ (eval echo "\"\$as_me:5770: 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
--echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
--echo "${ECHO_T}$lt_cv_nm_interface" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
- # find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4942,11 +5909,11 @@
- fi
-
- if test -n $lt_cv_sys_max_cmd_len ; then
-- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
-- echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
-+ { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
-
-@@ -4959,8 +5926,8 @@
- : ${MV="mv -f"}
- : ${RM="rm -f"}
-
--echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
--echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
-@@ -4969,18 +5936,18 @@
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
--echo "$as_me:$LINENO: result: $xsi_shell" >&5
--echo "${ECHO_T}$xsi_shell" >&6
-+{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+echo "${ECHO_T}$xsi_shell" >&6; }
-
-
--echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
--echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
--echo "$as_me:$LINENO: result: $lt_shell_append" >&5
--echo "${ECHO_T}$lt_shell_append" >&6
-+{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+echo "${ECHO_T}$lt_shell_append" >&6; }
-
-
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -5014,15 +5981,15 @@
-
-
-
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -5050,8 +6017,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5064,32 +6031,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5102,27 +6071,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OBJDUMP=$ac_ct_OBJDUMP
-+ if test "x$ac_ct_OBJDUMP" = x; then
-+ OBJDUMP="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OBJDUMP=$ac_ct_OBJDUMP
-+ fi
- else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-@@ -5134,8 +6117,8 @@
-
-
-
--echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5330,8 +6313,8 @@
- esac
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$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
-@@ -5350,8 +6333,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5364,32 +6347,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5402,27 +6387,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-+ if test "x$ac_ct_AR" = x; then
-+ AR="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -5443,8 +6442,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5457,32 +6456,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5495,27 +6496,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -5530,8 +6545,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5544,32 +6559,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5582,27 +6599,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -5675,8 +6706,8 @@
-
-
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5895,11 +6926,11 @@
- 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
-- echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
-+ { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
-- echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
-
-
-@@ -5924,11 +6955,11 @@
-
-
-
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
-- enableval="$enable_libtool_lock"
-+ enableval=$enable_libtool_lock;
-+fi
-
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
- # Some flags need to be propagated to the compiler or linker for good
-@@ -5955,7 +6986,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5958 "configure"' > conftest.$ac_ext
-+ echo '#line 6989 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -6047,8 +7078,8 @@
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
-- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6074,35 +7105,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--lt_cv_cc_needs_belf=no
-+ lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6111,8 +7139,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$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"
-@@ -6151,8 +7179,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6165,32 +7193,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--echo "${ECHO_T}$DSYMUTIL" >&6
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6203,27 +7233,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":"
- fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- DSYMUTIL=$ac_ct_DSYMUTIL
-+ if test "x$ac_ct_DSYMUTIL" = x; then
-+ DSYMUTIL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DSYMUTIL=$ac_ct_DSYMUTIL
-+ fi
- else
- DSYMUTIL="$ac_cv_prog_DSYMUTIL"
- fi
-@@ -6231,8 +7275,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6245,32 +7289,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $NMEDIT" >&5
--echo "${ECHO_T}$NMEDIT" >&6
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6283,27 +7329,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":"
- fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
-- echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--echo "${ECHO_T}$ac_ct_NMEDIT" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- NMEDIT=$ac_ct_NMEDIT
-+ if test "x$ac_ct_NMEDIT" = x; then
-+ NMEDIT=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ NMEDIT=$ac_ct_NMEDIT
-+ fi
- else
- NMEDIT="$ac_cv_prog_NMEDIT"
- fi
-@@ -6311,8 +7371,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6325,32 +7385,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $LIPO" >&5
--echo "${ECHO_T}$LIPO" >&6
-+ { echo "$as_me:$LINENO: result: $LIPO" >&5
-+echo "${ECHO_T}$LIPO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6363,27 +7425,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_LIPO" && ac_cv_prog_ac_ct_LIPO=":"
- fi
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
-- echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
--echo "${ECHO_T}$ac_ct_LIPO" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+echo "${ECHO_T}$ac_ct_LIPO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- LIPO=$ac_ct_LIPO
-+ if test "x$ac_ct_LIPO" = x; then
-+ LIPO=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ LIPO=$ac_ct_LIPO
-+ fi
- else
- LIPO="$ac_cv_prog_LIPO"
- fi
-@@ -6391,8 +7467,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6405,32 +7481,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OTOOL" >&5
--echo "${ECHO_T}$OTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $OTOOL" >&5
-+echo "${ECHO_T}$OTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6443,27 +7521,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OTOOL" && ac_cv_prog_ac_ct_OTOOL=":"
- fi
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
--echo "${ECHO_T}$ac_ct_OTOOL" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OTOOL=$ac_ct_OTOOL
-+ if test "x$ac_ct_OTOOL" = x; then
-+ OTOOL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OTOOL=$ac_ct_OTOOL
-+ fi
- else
- OTOOL="$ac_cv_prog_OTOOL"
- fi
-@@ -6471,8 +7563,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6485,32 +7577,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$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
-- echo "$as_me:$LINENO: result: $OTOOL64" >&5
--echo "${ECHO_T}$OTOOL64" >&6
-+ { echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+echo "${ECHO_T}$OTOOL64" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6523,27 +7617,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ 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"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_OTOOL64" && ac_cv_prog_ac_ct_OTOOL64=":"
- fi
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
--echo "${ECHO_T}$ac_ct_OTOOL64" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- OTOOL64=$ac_ct_OTOOL64
-+ if test "x$ac_ct_OTOOL64" = x; then
-+ OTOOL64=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ OTOOL64=$ac_ct_OTOOL64
-+ fi
- else
- OTOOL64="$ac_cv_prog_OTOOL64"
- fi
-@@ -6574,8 +7682,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6601,10 +7709,10 @@
- rm -f conftest.*
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6
-- echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6628,41 +7736,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_ld_exported_symbols_list=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--lt_cv_ld_exported_symbols_list=no
-+ lt_cv_ld_exported_symbols_list=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -6703,8 +7808,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -6738,24 +7843,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -6764,9 +7867,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6776,24 +7880,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -6804,6 +7906,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -6821,8 +7924,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -6845,24 +7948,22 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -6871,9 +7972,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6883,24 +7985,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -6911,6 +8011,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -6933,8 +8034,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6958,35 +8059,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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.
-@@ -7042,6 +8139,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* 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))
-@@ -7061,18 +8159,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7085,12 +8192,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7113,9 +8222,9 @@
- inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7129,38 +8238,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7175,9 +8281,9 @@
- for ac_header in dlfcn.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7191,38 +8297,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7242,10 +8345,9 @@
-
-
-
-- # Check whether --enable-shared or --disable-shared was given.
-+ # Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
-- enableval="$enable_shared"
-- p=${PACKAGE-default}
-+ enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
-@@ -7264,7 +8366,7 @@
- esac
- else
- enable_shared=yes
--fi;
-+fi
-
-
-
-@@ -7273,10 +8375,10 @@
-
-
-
-- # Check whether --enable-static or --disable-static was given.
-+
-+ # Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
-- enableval="$enable_static"
-- p=${PACKAGE-default}
-+ enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
-@@ -7295,7 +8397,7 @@
- esac
- else
- enable_static=yes
--fi;
-+fi
-
-
-
-@@ -7305,13 +8407,14 @@
-
-
-
--# Check whether --with-pic or --without-pic was given.
-+
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
-- withval="$with_pic"
-- pic_mode="$withval"
-+ withval=$with_pic; pic_mode="$withval"
- else
- pic_mode=default
--fi;
-+fi
-+
-
- test -z "$pic_mode" && pic_mode=default
-
-@@ -7321,10 +8424,9 @@
-
-
-
-- # Check whether --enable-fast-install or --disable-fast-install was given.
-+ # Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
-- enableval="$enable_fast_install"
-- p=${PACKAGE-default}
-+ enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
-@@ -7343,7 +8445,8 @@
- esac
- else
- enable_fast_install=yes
--fi;
-+fi
-+
-
-
-
-@@ -7403,8 +8506,8 @@
- setopt NO_GLOB_SUBST
- fi
-
--echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7418,8 +8521,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
-
-
-@@ -7511,8 +8614,8 @@
- case $deplibs_check_method in
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7564,11 +8667,11 @@
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7577,8 +8680,8 @@
-
- if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
-- echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7630,11 +8733,11 @@
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7714,8 +8817,8 @@
- if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-- echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7732,11 +8835,11 @@
- -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:7735: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8838: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7739: \$? = $ac_status" >&5
-+ echo "$as_me:8842: \$? = $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.
-@@ -7749,8 +8852,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$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"
-@@ -7769,8 +8872,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
-@@ -8041,8 +9144,8 @@
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-
-
-
-@@ -8053,8 +9156,8 @@
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
-- echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8071,11 +9174,11 @@
- -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:8074: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9177: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8078: \$? = $ac_status" >&5
-+ echo "$as_me:9181: \$? = $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.
-@@ -8088,8 +9191,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
-@@ -8112,8 +9215,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8140,8 +9243,8 @@
- LDFLAGS="$save_LDFLAGS"
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-@@ -8155,8 +9258,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8176,11 +9279,11 @@
- -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:8179: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9282: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8183: \$? = $ac_status" >&5
-+ echo "$as_me:9286: \$? = $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
-@@ -8202,16 +9305,16 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8231,11 +9334,11 @@
- -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:8234: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9337: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8238: \$? = $ac_status" >&5
-+ echo "$as_me:9341: \$? = $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
-@@ -8257,8 +9360,8 @@
- $RM conftest*
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-@@ -8266,16 +9369,16 @@
- 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
-- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&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
-- echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -8290,8 +9393,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag=
-@@ -8748,27 +9851,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -8786,8 +9885,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -8817,27 +9918,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -8855,8 +9952,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -9073,35 +10172,33 @@
- int foo(void) {}
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
- else
-@@ -9358,8 +10455,8 @@
- fi
- fi
-
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
-
- with_gnu_ld=$with_gnu_ld
-@@ -9395,46 +10492,52 @@
- # 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.
-- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-- $RM conftest*
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ $RM conftest*
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 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:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ 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:$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=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-- then
-- archive_cmds_need_lc=no
-- else
-- archive_cmds_need_lc=yes
-- fi
-- allow_undefined_flag=$lt_save_allow_undefined_flag
-- else
-- cat conftest.err 1>&5
-- fi
-- $RM conftest*
-- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+ 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
-+{ echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6; }
-+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
- ;;
- esac
- fi
-@@ -9597,8 +10700,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- case $host_os in
-@@ -10014,12 +11117,17 @@
- 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
-- save_LDFLAGS=$LDFLAGS
-- save_libdir=$libdir
-- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-- cat >conftest.$ac_ext <<_ACEOF
-+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10035,40 +11143,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-- shlibpath_overrides_runpath=yes
-+ lt_cv_shlibpath_overrides_runpath=yes
- fi
-
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- LDFLAGS=$save_LDFLAGS
-- libdir=$save_libdir
-+ 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
-@@ -10278,8 +11388,8 @@
- dynamic_linker=no
- ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -10380,8 +11490,8 @@
-
-
-
-- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" ||
- test -n "$runpath_var" ||
-@@ -10405,8 +11515,8 @@
- # directories.
- hardcode_action=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
-
- if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
-@@ -10450,8 +11560,8 @@
-
- darwin*)
- # if libdl is installed we need to link against it
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10464,56 +11574,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -10527,8 +11634,8 @@
- ;;
-
- *)
-- echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10555,73 +11662,64 @@
-
- #undef shl_load
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shl_load ();
- /* 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_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != shl_load;
-+return shl_load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_shl_load=no
-+ ac_cv_func_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
- else
-- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10634,61 +11732,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shl_load ();
- int
- main ()
- {
--shl_load ();
-+return shl_load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10715,73 +11810,64 @@
-
- #undef dlopen
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- /* 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_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_dlopen=no
-+ ac_cv_func_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
- else
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10794,61 +11880,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10861,61 +11944,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_svld_dlopen=no
-+ ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
-- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10928,56 +12008,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return dld_link ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dld_dld_link=no
-+ ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-@@ -11017,8 +12094,8 @@
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
-- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11028,7 +12105,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11031 "configure"
-+#line 12108 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11108,13 +12185,13 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$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\"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11124,7 +12201,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11127 "configure"
-+#line 12204 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11204,8 +12281,8 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
-@@ -11243,13 +12320,13 @@
-
- striplib=
- old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
-@@ -11257,16 +12334,16 @@
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- ;;
- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- fi
-@@ -11283,13 +12360,13 @@
-
-
- # Report which library types will actually be built
-- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
-+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
-- echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -11309,15 +12386,15 @@
- fi
- ;;
- esac
-- echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
-- echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
-- echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
-+ { echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
-
-
-@@ -11343,7 +12420,7 @@
-
-
-
-- ac_config_commands="$ac_config_commands libtool"
-+ ac_config_commands="$ac_config_commands libtool"
-
-
-
-@@ -11355,101 +12432,55 @@
-
- if test -n "${sys_dir}"; then
- case ${sys_dir} in
-- a29khif)
--
--subdirs="$subdirs a29khif"
-+ a29khif) subdirs="$subdirs a29khif"
- ;;
-- arc)
--
--subdirs="$subdirs arc"
-+ arc) subdirs="$subdirs arc"
- ;;
-- arm)
--
--subdirs="$subdirs arm"
-+ arm) subdirs="$subdirs arm"
- ;;
-- d10v)
--
--subdirs="$subdirs d10v"
-+ avr32) subdirs="$subdirs avr32"
- ;;
-- decstation)
--
--subdirs="$subdirs decstation"
-+ d10v) subdirs="$subdirs d10v"
- ;;
-- h8300hms)
--
--subdirs="$subdirs h8300hms"
-+ decstation) subdirs="$subdirs decstation"
- ;;
-- h8500hms)
--
--subdirs="$subdirs h8500hms"
-+ h8300hms) subdirs="$subdirs h8300hms"
- ;;
-- linux)
--
--subdirs="$subdirs linux"
-+ h8500hms) subdirs="$subdirs h8500hms"
- ;;
-- m88kbug)
--
--subdirs="$subdirs m88kbug"
-+ linux) subdirs="$subdirs linux"
- ;;
-- mmixware)
--
--subdirs="$subdirs mmixware"
-+ m88kbug) subdirs="$subdirs m88kbug"
- ;;
-- netware)
--
--subdirs="$subdirs netware"
-+ mmixware) subdirs="$subdirs mmixware"
- ;;
-- rdos)
--
--subdirs="$subdirs rdos"
-+ netware) subdirs="$subdirs netware"
- ;;
-- rtems)
--
--subdirs="$subdirs rtems"
-+ rdos) subdirs="$subdirs rdos"
- ;;
-- sh)
--
--subdirs="$subdirs sh"
-+ rtems) subdirs="$subdirs rtems"
- ;;
-- sparc64)
--
--subdirs="$subdirs sparc64"
-+ sh) subdirs="$subdirs sh"
- ;;
-- sun4)
--
--subdirs="$subdirs sun4"
-+ sparc64) subdirs="$subdirs sparc64"
- ;;
-- sysmec)
--
--subdirs="$subdirs sysmec"
-+ sun4) subdirs="$subdirs sun4"
- ;;
-- sysnec810)
--
--subdirs="$subdirs sysnec810"
-+ sysmec) subdirs="$subdirs sysmec"
- ;;
-- sysnecv850)
--
--subdirs="$subdirs sysnecv850"
-+ sysnec810) subdirs="$subdirs sysnec810"
- ;;
-- sysvi386)
--
--subdirs="$subdirs sysvi386"
-+ sysnecv850) subdirs="$subdirs sysnecv850"
- ;;
-- sysvnecv70)
--
--subdirs="$subdirs sysvnecv70"
-+ sysvi386) subdirs="$subdirs sysvi386"
- ;;
-- tic80)
--
--subdirs="$subdirs tic80"
-+ sysvnecv70) subdirs="$subdirs sysvnecv70"
- ;;
-- w65)
--
--subdirs="$subdirs w65"
-+ tic80) subdirs="$subdirs tic80"
- ;;
-- z8ksim)
--
--subdirs="$subdirs z8ksim"
-+ w65) subdirs="$subdirs w65"
-+ ;;
-+ z8ksim) subdirs="$subdirs z8ksim"
- ;;
- esac;
- fi
-@@ -11471,7 +12502,7 @@
- fi
-
-
-- ac_config_files="$ac_config_files Makefile"
-+ac_config_files="$ac_config_files Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -11491,39 +12522,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ 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 \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
-- : clear
-+ :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!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" && echo "updating cache $cache_file"
-+ 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" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -11532,63 +12582,48 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# 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
--
- # Transform confdefs.h into DEFS.
- # Protect against shell expansion while executing Makefile rules.
- # Protect against Makefile macro expansion.
- #
- # If the first sed substitution is executed (which looks for macros that
--# take arguments), then we branch to the quote section. Otherwise,
-+# take arguments), then branch to the quote section. Otherwise,
- # look for a macro that doesn't take arguments.
--cat >confdef2opt.sed <<\_ACEOF
-+ac_script='
- t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-+:clear
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
- t quote
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
- t quote
--d
--: quote
--s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
--s,\[,\\&,g
--s,\],\\&,g
--s,\$,$$,g
--p
--_ACEOF
--# We use echo to avoid assuming a particular line-breaking character.
--# The extra dot is to prevent the shell from consuming trailing
--# line-breaks from the sub-command output. A line-break within
--# single-quotes doesn't work because, if this script is created in a
--# platform that uses two characters for line-breaks (e.g., DOS), tr
--# would break.
--ac_LF_and_DOT=`echo; echo .`
--DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
--rm -f confdef2opt.sed
-+b any
-+:quote
-+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-+s/\[/\\&/g
-+s/\]/\\&/g
-+s/\$/$$/g
-+H
-+:any
-+${
-+ g
-+ s/^\n//
-+ s/\n/ /g
-+ p
-+}
-+'
-+DEFS=`sed -n "$ac_script" confdefs.h`
-
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`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.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -11703,17 +12738,45 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
-+
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -11723,8 +12786,43 @@
- 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.)
-+as_nl='
-+'
-+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
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -11738,18 +12836,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+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
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -11757,159 +12856,120 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
--
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# 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
--
--# 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
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- 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
-
-- ;;
-- 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
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); 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 sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- 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
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ 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'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+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=:
-@@ -11918,7 +12978,28 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+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'"
-@@ -11927,31 +13008,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# 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. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by newlib $as_me 1.17.0, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -11959,30 +13023,19 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_commands="$ac_config_commands"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -11990,7 +13043,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -12004,19 +13057,21 @@
- $config_commands
-
- Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- newlib config.status 1.17.0
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -12027,60 +13082,42 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
-- --header | --heade | --head | --hea )
-- $ac_shift
-- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-- ac_need_defaults=false;;
-+ --he | --h | --help | --hel | -h )
-+ 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.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -12096,17 +13133,28 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-@@ -12367,22 +13415,23 @@
-
- _ACEOF
-
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "libtool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+ case $ac_config_target in
-+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- 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
-@@ -12393,397 +13442,493 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# 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 ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s,@SHELL@,$SHELL,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s,@exec_prefix@,$exec_prefix,;t t
--s,@prefix@,$prefix,;t t
--s,@program_transform_name@,$program_transform_name,;t t
--s,@bindir@,$bindir,;t t
--s,@sbindir@,$sbindir,;t t
--s,@libexecdir@,$libexecdir,;t t
--s,@datadir@,$datadir,;t t
--s,@sysconfdir@,$sysconfdir,;t t
--s,@sharedstatedir@,$sharedstatedir,;t t
--s,@localstatedir@,$localstatedir,;t t
--s,@libdir@,$libdir,;t t
--s,@includedir@,$includedir,;t t
--s,@oldincludedir@,$oldincludedir,;t t
--s,@infodir@,$infodir,;t t
--s,@mandir@,$mandir,;t t
--s,@build_alias@,$build_alias,;t t
--s,@host_alias@,$host_alias,;t t
--s,@target_alias@,$target_alias,;t t
--s,@DEFS@,$DEFS,;t t
--s,@ECHO_C@,$ECHO_C,;t t
--s,@ECHO_N@,$ECHO_N,;t t
--s,@ECHO_T@,$ECHO_T,;t t
--s,@LIBS@,$LIBS,;t t
--s,@MAY_SUPPLY_SYSCALLS_TRUE@,$MAY_SUPPLY_SYSCALLS_TRUE,;t t
--s,@MAY_SUPPLY_SYSCALLS_FALSE@,$MAY_SUPPLY_SYSCALLS_FALSE,;t t
--s,@newlib_basedir@,$newlib_basedir,;t t
--s,@build@,$build,;t t
--s,@build_cpu@,$build_cpu,;t t
--s,@build_vendor@,$build_vendor,;t t
--s,@build_os@,$build_os,;t t
--s,@host@,$host,;t t
--s,@host_cpu@,$host_cpu,;t t
--s,@host_vendor@,$host_vendor,;t t
--s,@host_os@,$host_os,;t t
--s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@CYGPATH_W@,$CYGPATH_W,;t t
--s,@PACKAGE@,$PACKAGE,;t t
--s,@VERSION@,$VERSION,;t t
--s,@ACLOCAL@,$ACLOCAL,;t t
--s,@AUTOCONF@,$AUTOCONF,;t t
--s,@AUTOMAKE@,$AUTOMAKE,;t t
--s,@AUTOHEADER@,$AUTOHEADER,;t t
--s,@MAKEINFO@,$MAKEINFO,;t t
--s,@install_sh@,$install_sh,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s,@mkdir_p@,$mkdir_p,;t t
--s,@AWK@,$AWK,;t t
--s,@SET_MAKE@,$SET_MAKE,;t t
--s,@am__leading_dot@,$am__leading_dot,;t t
--s,@AMTAR@,$AMTAR,;t t
--s,@am__tar@,$am__tar,;t t
--s,@am__untar@,$am__untar,;t t
--s,@CC@,$CC,;t t
--s,@DEPDIR@,$DEPDIR,;t t
--s,@am__include@,$am__include,;t t
--s,@am__quote@,$am__quote,;t t
--s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s,@CCDEPMODE@,$CCDEPMODE,;t t
--s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s,@AS@,$AS,;t t
--s,@ac_ct_AS@,$ac_ct_AS,;t t
--s,@AR@,$AR,;t t
--s,@ac_ct_AR@,$ac_ct_AR,;t t
--s,@RANLIB@,$RANLIB,;t t
--s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@READELF@,$READELF,;t t
--s,@ac_ct_READELF@,$ac_ct_READELF,;t t
--s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s,@MAINT@,$MAINT,;t t
--s,@CCAS@,$CCAS,;t t
--s,@CCASFLAGS@,$CCASFLAGS,;t t
--s,@NEWLIB_CFLAGS@,$NEWLIB_CFLAGS,;t t
--s,@LDFLAGS@,$LDFLAGS,;t t
--s,@ELIX_LEVEL_0_TRUE@,$ELIX_LEVEL_0_TRUE,;t t
--s,@ELIX_LEVEL_0_FALSE@,$ELIX_LEVEL_0_FALSE,;t t
--s,@ELIX_LEVEL_1_TRUE@,$ELIX_LEVEL_1_TRUE,;t t
--s,@ELIX_LEVEL_1_FALSE@,$ELIX_LEVEL_1_FALSE,;t t
--s,@ELIX_LEVEL_2_TRUE@,$ELIX_LEVEL_2_TRUE,;t t
--s,@ELIX_LEVEL_2_FALSE@,$ELIX_LEVEL_2_FALSE,;t t
--s,@ELIX_LEVEL_3_TRUE@,$ELIX_LEVEL_3_TRUE,;t t
--s,@ELIX_LEVEL_3_FALSE@,$ELIX_LEVEL_3_FALSE,;t t
--s,@ELIX_LEVEL_4_TRUE@,$ELIX_LEVEL_4_TRUE,;t t
--s,@ELIX_LEVEL_4_FALSE@,$ELIX_LEVEL_4_FALSE,;t t
--s,@USE_LIBTOOL_TRUE@,$USE_LIBTOOL_TRUE,;t t
--s,@USE_LIBTOOL_FALSE@,$USE_LIBTOOL_FALSE,;t t
--s,@OBJEXT@,$OBJEXT,;t t
--s,@oext@,$oext,;t t
--s,@aext@,$aext,;t t
--s,@lpfx@,$lpfx,;t t
--s,@libm_machine_dir@,$libm_machine_dir,;t t
--s,@machine_dir@,$machine_dir,;t t
--s,@sys_dir@,$sys_dir,;t t
--s,@SED@,$SED,;t t
--s,@DLLTOOL@,$DLLTOOL,;t t
--s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
--s,@OBJDUMP@,$OBJDUMP,;t t
--s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
--s,@LIBTOOL@,$LIBTOOL,;t t
--s,@CFLAGS@,$CFLAGS,;t t
--s,@CPPFLAGS@,$CPPFLAGS,;t t
--s,@ac_ct_CC@,$ac_ct_CC,;t t
--s,@EXEEXT@,$EXEEXT,;t t
--s,@EGREP@,$EGREP,;t t
--s,@FGREP@,$FGREP,;t t
--s,@GREP@,$GREP,;t t
--s,@LD@,$LD,;t t
--s,@DUMPBIN@,$DUMPBIN,;t t
--s,@ac_ct_DUMPBIN@,$ac_ct_DUMPBIN,;t t
--s,@NM@,$NM,;t t
--s,@LN_S@,$LN_S,;t t
--s,@lt_ECHO@,$lt_ECHO,;t t
--s,@DSYMUTIL@,$DSYMUTIL,;t t
--s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t
--s,@NMEDIT@,$NMEDIT,;t t
--s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t
--s,@LIPO@,$LIPO,;t t
--s,@ac_ct_LIPO@,$ac_ct_LIPO,;t t
--s,@OTOOL@,$OTOOL,;t t
--s,@ac_ct_OTOOL@,$ac_ct_OTOOL,;t t
--s,@OTOOL64@,$OTOOL64,;t t
--s,@ac_ct_OTOOL64@,$ac_ct_OTOOL64,;t t
--s,@CPP@,$CPP,;t t
--s,@subdirs@,$subdirs,;t t
--s,@CRT0@,$CRT0,;t t
--s,@HAVE_SYS_DIR_TRUE@,$HAVE_SYS_DIR_TRUE,;t t
--s,@HAVE_SYS_DIR_FALSE@,$HAVE_SYS_DIR_FALSE,;t t
--s,@LIBOBJS@,$LIBOBJS,;t t
--s,@LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+MAY_SUPPLY_SYSCALLS_TRUE!$MAY_SUPPLY_SYSCALLS_TRUE$ac_delim
-+MAY_SUPPLY_SYSCALLS_FALSE!$MAY_SUPPLY_SYSCALLS_FALSE$ac_delim
-+newlib_basedir!$newlib_basedir$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+CC!$CC$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+AS!$AS$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+READELF!$READELF$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+CCAS!$CCAS$ac_delim
-+CCASFLAGS!$CCASFLAGS$ac_delim
-+NEWLIB_CFLAGS!$NEWLIB_CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+ELIX_LEVEL_0_TRUE!$ELIX_LEVEL_0_TRUE$ac_delim
-+ELIX_LEVEL_0_FALSE!$ELIX_LEVEL_0_FALSE$ac_delim
-+ELIX_LEVEL_1_TRUE!$ELIX_LEVEL_1_TRUE$ac_delim
-+ELIX_LEVEL_1_FALSE!$ELIX_LEVEL_1_FALSE$ac_delim
-+ELIX_LEVEL_2_TRUE!$ELIX_LEVEL_2_TRUE$ac_delim
-+ELIX_LEVEL_2_FALSE!$ELIX_LEVEL_2_FALSE$ac_delim
-+ELIX_LEVEL_3_TRUE!$ELIX_LEVEL_3_TRUE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+ELIX_LEVEL_3_FALSE!$ELIX_LEVEL_3_FALSE$ac_delim
-+ELIX_LEVEL_4_TRUE!$ELIX_LEVEL_4_TRUE$ac_delim
-+ELIX_LEVEL_4_FALSE!$ELIX_LEVEL_4_FALSE$ac_delim
-+USE_LIBTOOL_TRUE!$USE_LIBTOOL_TRUE$ac_delim
-+USE_LIBTOOL_FALSE!$USE_LIBTOOL_FALSE$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+oext!$oext$ac_delim
-+aext!$aext$ac_delim
-+lpfx!$lpfx$ac_delim
-+libm_machine_dir!$libm_machine_dir$ac_delim
-+machine_dir!$machine_dir$ac_delim
-+sys_dir!$sys_dir$ac_delim
-+SED!$SED$ac_delim
-+DLLTOOL!$DLLTOOL$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+FGREP!$FGREP$ac_delim
-+LD!$LD$ac_delim
-+DUMPBIN!$DUMPBIN$ac_delim
-+ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
-+NM!$NM$ac_delim
-+LN_S!$LN_S$ac_delim
-+lt_ECHO!$lt_ECHO$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
-+LIPO!$LIPO$ac_delim
-+OTOOL!$OTOOL$ac_delim
-+OTOOL64!$OTOOL64$ac_delim
-+CPP!$CPP$ac_delim
-+subdirs!$subdirs$ac_delim
-+CRT0!$CRT0$ac_delim
-+HAVE_SYS_DIR_TRUE!$HAVE_SYS_DIR_TRUE$ac_delim
-+HAVE_SYS_DIR_FALSE!$HAVE_SYS_DIR_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
- _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
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[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 ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$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 "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
- esac
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ 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 ||
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+ 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
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+_ACEOF
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
-- # 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. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# 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=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ 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
- sed "$ac_vpsub
- $extrasub
-@@ -12791,142 +13936,43 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t
--s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
--s,@INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_dest" : 'X\(//\)[^/]' \| \
-- X"$ac_dest" : 'X\(//\)$' \| \
-- X"$ac_dest" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;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
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+
-+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"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+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;}
-
-- ac_builddir=.
--
--if test "$ac_dir" != .; then
-- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ 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
-+ ;;
-
--case $srcdir in
-- .) # No --srcdir option. We are building in place.
-- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+ esac
-
-
-- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
-- case $ac_dest in
-- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+ case $ac_file$ac_mode in
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
-@@ -12936,18 +13982,29 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-- dirpart=`(dirname "$mf") 2>/dev/null ||
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- else
- continue
- fi
-@@ -12969,49 +14026,76 @@
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
-- fdir=`(dirname "$file") 2>/dev/null ||
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir=$dirpart/$fdir
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-- libtool )
-+ "libtool":C)
-
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
-@@ -13652,11 +14736,10 @@
- chmod +x "$ofile"
-
- ;;
-+
- esac
--done
--_ACEOF
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-@@ -13686,7 +14769,7 @@
- fi
-
- #
--# CONFIG_SUBDIRS section, as fixed in confsubdir.m4.
-+# CONFIG_SUBDIRS section.
- #
- if test "$no_recursion" != yes; then
-
-@@ -13733,7 +14816,12 @@
- case $ac_arg in
- *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
-- ac_sub_configure_args="$ac_arg $ac_sub_configure_args"
-+ ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-+
-+ # Pass --silent
-+ if test "$silent" = yes; then
-+ ac_sub_configure_args="--silent $ac_sub_configure_args"
-+ fi
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-@@ -13742,97 +14830,83 @@
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
-- { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
--echo "$as_me: configuring in $ac_dir" >&6;}
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-+ echo "$as_me:$LINENO: $ac_msg" >&5
-+ echo "$ac_msg" >&6
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`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 ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ 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 ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`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
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ 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 ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ 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"
-@@ -13856,8 +14930,8 @@
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-- *) # Relative path.
-- ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-+ *) # Relative name.
-+ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-diff -Naur newlib-1.17.0/newlib/libc/sys/configure.in newlib-1.17.0-new/newlib/libc/sys/configure.in
---- newlib-1.17.0/newlib/libc/sys/configure.in 2007-05-24 19:33:37.000000000 +0200
-+++ newlib-1.17.0-new/newlib/libc/sys/configure.in 2009-05-22 09:57:50.000000000 +0200
-@@ -24,6 +24,7 @@
- a29khif) AC_CONFIG_SUBDIRS(a29khif) ;;
- arc) AC_CONFIG_SUBDIRS(arc) ;;
- arm) AC_CONFIG_SUBDIRS(arm) ;;
-+ avr32) AC_CONFIG_SUBDIRS(avr32) ;;
- d10v) AC_CONFIG_SUBDIRS(d10v) ;;
- decstation) AC_CONFIG_SUBDIRS(decstation) ;;
- h8300hms) AC_CONFIG_SUBDIRS(h8300hms) ;;
diff --git a/patches/uClibc/0.9.30.2/190-avr32-add-varargs-handling-of-prctl-syscall.patch b/patches/uClibc/0.9.30.2/190-avr32-add-varargs-handling-of-prctl-syscall.patch
deleted file mode 100644
index cd22883..0000000
--- a/patches/uClibc/0.9.30.2/190-avr32-add-varargs-handling-of-prctl-syscall.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 85bc04d5436ca6c8a30a1ad28862260a04b8b3d5 Mon Sep 17 00:00:00 2001
-From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
-Date: Wed, 16 Dec 2009 13:16:08 +0100
-Subject: [PATCH 02/15] avr32: add varargs handling of prctl syscall
-
-prctl is defined to use varargs in the header file, hence it needs varargs
-specific handling in the source. This patch properly handles the variodic
-argument before the syscall is passed to the kernel for the AVR32 architecture.
-
-Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
----
- libc/sysdeps/linux/avr32/Makefile.arch | 2 +-
- libc/sysdeps/linux/avr32/prctl.c | 36 ++++++++++++++++++++++++++++++++
- 2 files changed, 37 insertions(+), 1 deletions(-)
- create mode 100644 libc/sysdeps/linux/avr32/prctl.c
-
-diff --git a/libc/sysdeps/linux/avr32/Makefile.arch b/libc/sysdeps/linux/avr32/Makefile.arch
-index bc5f625..98b85a7 100644
---- a/libc/sysdeps/linux/avr32/Makefile.arch
-+++ b/libc/sysdeps/linux/avr32/Makefile.arch
-@@ -5,7 +5,7 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
-
--CSRC := brk.c clone.c mmap.c sigaction.c
-+CSRC := brk.c clone.c mmap.c prctl.c sigaction.c
-
- SSRC := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
- sigrestorer.S syscall.S vfork.S
-diff --git a/libc/sysdeps/linux/avr32/prctl.c b/libc/sysdeps/linux/avr32/prctl.c
-new file mode 100644
-index 0000000..4e146e3
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/prctl.c
-@@ -0,0 +1,36 @@
-+/*
-+ * prctl syscall for AVR32 Linux.
-+ *
-+ * Copyright (C) 2010 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License. See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <sys/syscall.h>
-+#include <sys/prctl.h>
-+#include <stdarg.h>
-+
-+#ifdef __NR_prctl
-+#define __NR___syscall_prctl __NR_prctl
-+static inline _syscall5(int, __syscall_prctl, int, option, long, arg2,
-+ long, arg3, long, arg4, long, arg5);
-+
-+int prctl(int __option, ...)
-+{
-+ long arg2;
-+ long arg3;
-+ long arg4;
-+ long arg5;
-+ va_list ap;
-+
-+ va_start(ap, __option);
-+ arg2 = va_arg(ap, long);
-+ arg3 = va_arg(ap, long);
-+ arg4 = va_arg(ap, long);
-+ arg5 = va_arg(ap, long);
-+ va_end(ap);
-+
-+ return INLINE_SYSCALL(prctl, 5, __option, arg2, arg3, arg4, arg5);
-+}
-+#endif
---
-1.6.6.1
-
diff --git a/patches/uClibc/0.9.30.2/200-clean-up-O_CLOEXEC-handling.patch b/patches/uClibc/0.9.30.2/200-clean-up-O_CLOEXEC-handling.patch
deleted file mode 100644
index 2abfe07..0000000
--- a/patches/uClibc/0.9.30.2/200-clean-up-O_CLOEXEC-handling.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From 74ca5695cd9913691192e075449b8be5794d50f0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 8 Oct 2009 02:51:55 +0000
-Subject: [PATCH 12/15] clean up O_CLOEXEC handling
-
-Drop the "#ifndef O_CLOEXEC" cruft, enable O_CLOEXEC in most fcntl.h
-headers, and import __ASSUME_O_CLOEXEC from glibc.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/pwd_grp/lckpwdf.c | 8 +++++++-
- libc/sysdeps/linux/alpha/bits/fcntl.h | 2 --
- libc/sysdeps/linux/arm/bits/fcntl.h | 2 --
- libc/sysdeps/linux/avr32/bits/fcntl.h | 1 +
- libc/sysdeps/linux/bfin/bits/fcntl.h | 2 ++
- libc/sysdeps/linux/cris/bits/fcntl.h | 1 +
- libc/sysdeps/linux/frv/bits/fcntl.h | 2 ++
- libc/sysdeps/linux/hppa/bits/fcntl.h | 1 +
- libc/sysdeps/linux/i386/bits/fcntl.h | 2 --
- libc/sysdeps/linux/ia64/bits/fcntl.h | 2 --
- libc/sysdeps/linux/m68k/bits/fcntl.h | 1 +
- libc/sysdeps/linux/microblaze/bits/fcntl.h | 2 ++
- libc/sysdeps/linux/mips/bits/fcntl.h | 1 +
- libc/sysdeps/linux/powerpc/bits/fcntl.h | 2 --
- libc/sysdeps/linux/sh/bits/fcntl.h | 2 --
- libc/sysdeps/linux/sh64/bits/fcntl.h | 2 ++
- libc/sysdeps/linux/sparc/bits/fcntl.h | 2 --
- libc/sysdeps/linux/x86_64/bits/fcntl.h | 2 --
- libc/sysdeps/linux/xtensa/bits/fcntl.h | 1 +
- 19 files changed, 21 insertions(+), 17 deletions(-)
-
-diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
-index 0b0fb47..aec6283 100644
---- a/libc/pwd_grp/lckpwdf.c
-+++ b/libc/pwd_grp/lckpwdf.c
-@@ -75,7 +75,7 @@ lckpwdf (void)
- /* Prevent problems caused by multiple threads. */
- __UCLIBC_MUTEX_LOCK(mylock);
-
-- lock_fd = open (_PATH_PASSWD, O_WRONLY);
-+ lock_fd = open (_PATH_PASSWD, O_WRONLY | O_CLOEXEC);
- if (lock_fd == -1) {
- /* Cannot create lock file. */
- goto DONE;
-@@ -97,6 +97,12 @@ lckpwdf (void)
- goto DONE;
- }
-
-+#ifndef __ASSUME_O_CLOEXEC
-+ /* Make sure file gets correctly closed when process finished. */
-+ fcntl (lock_fd, F_SETFD, FD_CLOEXEC);
-+#endif
-+
-+
- /* Now we have to get exclusive write access. Since multiple
- process could try this we won't stop when it first fails.
- Instead we set a timeout for the system call. Once the timer
-diff --git a/libc/sysdeps/linux/alpha/bits/fcntl.h b/libc/sysdeps/linux/alpha/bits/fcntl.h
-index 2a6b9ea..649c563 100644
---- a/libc/sysdeps/linux/alpha/bits/fcntl.h
-+++ b/libc/sysdeps/linux/alpha/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_NOFOLLOW 0200000 /* Do not follow links. */
- # define O_DIRECT 02000000 /* Direct disk access. */
- # define O_NOATIME 04000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 010000000 /* Set close_on_exec. */
--# endif
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/arm/bits/fcntl.h b/libc/sysdeps/linux/arm/bits/fcntl.h
-index 86cea4b..7cc5a9d 100644
---- a/libc/sysdeps/linux/arm/bits/fcntl.h
-+++ b/libc/sysdeps/linux/arm/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_NOFOLLOW 0100000 /* Do not follow links. */
- # define O_DIRECT 0200000 /* Direct disk access. */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/avr32/bits/fcntl.h b/libc/sysdeps/linux/avr32/bits/fcntl.h
-index 2301e22..767243e 100644
---- a/libc/sysdeps/linux/avr32/bits/fcntl.h
-+++ b/libc/sysdeps/linux/avr32/bits/fcntl.h
-@@ -30,6 +30,7 @@
- # define O_DIRECTORY 00200000 /* direct disk access */
- # define O_NOFOLLOW 00400000 /* don't follow links */
- # define O_NOATIME 01000000 /* don't set atime */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/bfin/bits/fcntl.h b/libc/sysdeps/linux/bfin/bits/fcntl.h
-index 7d0bcf9..aabf94d 100644
---- a/libc/sysdeps/linux/bfin/bits/fcntl.h
-+++ b/libc/sysdeps/linux/bfin/bits/fcntl.h
-@@ -48,6 +48,8 @@
- # define O_DIRECTORY 040000 /* Must be a directory. */
- # define O_NOFOLLOW 0100000 /* Do not follow links. */
- # define O_DIRECT 0200000 /* Direct disk access. */
-+# define O_NOATIME 01000000 /* don't set atime */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/cris/bits/fcntl.h b/libc/sysdeps/linux/cris/bits/fcntl.h
-index a2106ef..29443ba 100644
---- a/libc/sysdeps/linux/cris/bits/fcntl.h
-+++ b/libc/sysdeps/linux/cris/bits/fcntl.h
-@@ -50,6 +50,7 @@
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/frv/bits/fcntl.h b/libc/sysdeps/linux/frv/bits/fcntl.h
-index 06e8860..5bff4d3 100644
---- a/libc/sysdeps/linux/frv/bits/fcntl.h
-+++ b/libc/sysdeps/linux/frv/bits/fcntl.h
-@@ -45,6 +45,8 @@
- # define O_DIRECT 040000 /* Direct disk access. */
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
-+# define O_NOATIME 01000000 /* don't set atime */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/hppa/bits/fcntl.h b/libc/sysdeps/linux/hppa/bits/fcntl.h
-index cc23bf8..86e3b6f 100644
---- a/libc/sysdeps/linux/hppa/bits/fcntl.h
-+++ b/libc/sysdeps/linux/hppa/bits/fcntl.h
-@@ -50,6 +50,7 @@
- # define O_DIRECTORY 00010000 /* Must be a directory. */
- # define O_NOFOLLOW 00000200 /* Do not follow links. */
- # define O_NOATIME 04000000 /* Do not set atime. */
-+# define O_CLOEXEC 010000000 /* set close_on_exec */
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/i386/bits/fcntl.h b/libc/sysdeps/linux/i386/bits/fcntl.h
-index 7f0b552..22e073b 100644
---- a/libc/sysdeps/linux/i386/bits/fcntl.h
-+++ b/libc/sysdeps/linux/i386/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/ia64/bits/fcntl.h b/libc/sysdeps/linux/ia64/bits/fcntl.h
-index d134c4b..85a55f6 100644
---- a/libc/sysdeps/linux/ia64/bits/fcntl.h
-+++ b/libc/sysdeps/linux/ia64/bits/fcntl.h
-@@ -49,9 +49,7 @@
- # define O_DIRECTORY 0200000 /* must be a directory */
- # define O_NOFOLLOW 0400000 /* don't follow links */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/m68k/bits/fcntl.h b/libc/sysdeps/linux/m68k/bits/fcntl.h
-index d36198d..e564b42 100644
---- a/libc/sysdeps/linux/m68k/bits/fcntl.h
-+++ b/libc/sysdeps/linux/m68k/bits/fcntl.h
-@@ -49,6 +49,7 @@
- # define O_NOFOLLOW 0100000 /* Do not follow links. */
- # define O_DIRECT 0200000 /* Direct disk access. */
- # define O_NOATIME 01000000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/microblaze/bits/fcntl.h b/libc/sysdeps/linux/microblaze/bits/fcntl.h
-index c8aeb91..da35209 100644
---- a/libc/sysdeps/linux/microblaze/bits/fcntl.h
-+++ b/libc/sysdeps/linux/microblaze/bits/fcntl.h
-@@ -45,6 +45,8 @@
- # define O_DIRECTORY 040000 /* Must be a directory. */
- # define O_NOFOLLOW 0100000 /* Do not follow links. */
- # define O_DIRECT 0200000 /* Direct disk access. */
-+# define O_NOATIME 01000000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/mips/bits/fcntl.h b/libc/sysdeps/linux/mips/bits/fcntl.h
-index ef015a4..f0072fd 100644
---- a/libc/sysdeps/linux/mips/bits/fcntl.h
-+++ b/libc/sysdeps/linux/mips/bits/fcntl.h
-@@ -51,6 +51,7 @@
- # define O_DIRECT 0x8000 /* Direct disk access hint. */
- # define O_DIRECTORY 0x10000 /* Must be a directory. */
- # define O_NOATIME 0x40000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has no synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/powerpc/bits/fcntl.h b/libc/sysdeps/linux/powerpc/bits/fcntl.h
-index ceb75b4..0759c6a 100644
---- a/libc/sysdeps/linux/powerpc/bits/fcntl.h
-+++ b/libc/sysdeps/linux/powerpc/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_DIRECTORY 040000 /* Must be a directory. */
- # define O_NOFOLLOW 0100000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/sh/bits/fcntl.h b/libc/sysdeps/linux/sh/bits/fcntl.h
-index 570484c..adb7377 100644
---- a/libc/sysdeps/linux/sh/bits/fcntl.h
-+++ b/libc/sysdeps/linux/sh/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/sh64/bits/fcntl.h b/libc/sysdeps/linux/sh64/bits/fcntl.h
-index 06e8860..245d35a 100644
---- a/libc/sysdeps/linux/sh64/bits/fcntl.h
-+++ b/libc/sysdeps/linux/sh64/bits/fcntl.h
-@@ -45,6 +45,8 @@
- # define O_DIRECT 040000 /* Direct disk access. */
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
-+# define O_NOATIME 01000000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h
-index 29c09a9..31a6d9b 100644
---- a/libc/sysdeps/linux/sparc/bits/fcntl.h
-+++ b/libc/sysdeps/linux/sparc/bits/fcntl.h
-@@ -49,9 +49,7 @@
- # define O_NOFOLLOW 0x20000 /* don't follow links */
- # define O_DIRECT 0x100000 /* direct disk access hint */
- # define O_NOATIME 0x200000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 0x400000 /* Set close_on_exit. */
--# endif
- #endif
-
- #ifdef __USE_LARGEFILE64
-diff --git a/libc/sysdeps/linux/x86_64/bits/fcntl.h b/libc/sysdeps/linux/x86_64/bits/fcntl.h
-index be00e4a..f1cf388 100644
---- a/libc/sysdeps/linux/x86_64/bits/fcntl.h
-+++ b/libc/sysdeps/linux/x86_64/bits/fcntl.h
-@@ -50,9 +50,7 @@
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
--# if 0
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
--# endif
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
-diff --git a/libc/sysdeps/linux/xtensa/bits/fcntl.h b/libc/sysdeps/linux/xtensa/bits/fcntl.h
-index a89362e..921a626 100644
---- a/libc/sysdeps/linux/xtensa/bits/fcntl.h
-+++ b/libc/sysdeps/linux/xtensa/bits/fcntl.h
-@@ -50,6 +50,7 @@
- # define O_DIRECTORY 0200000 /* Must be a directory. */
- # define O_NOFOLLOW 0400000 /* Do not follow links. */
- # define O_NOATIME 01000000 /* Do not set atime. */
-+# define O_CLOEXEC 02000000 /* set close_on_exec */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
---
-1.6.6.1
-
diff --git a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
deleted file mode 100644
index 0381ba8..0000000
--- a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 1 Oct 2012 18:12:54 +1300
-Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
-
-Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
-exported header files were updated to use these new types. Add the
-definitions for __kernel_long_t and __kernel_ulong_t to the relevant
-kernel_types.h headers.
-
-This change was automated with the following scriptlet
-
- git grep --name-only 'typedef.*__kernel_old_dev_t' \
- | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
- typedef long\t\t__kernel_long_t;\
- typedef unsigned long\t__kernel_ulong_t;'
-
-Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
-Here's a cleaned up patch which should get the whitespace right. I'm a
-bit iffy about the sparc changes they make sense to me but it's not a
-platform I have access to.
-
-I can break this up per arch or per maintainer if requested.
-
- libc/sysdeps/linux/alpha/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h | 2 ++
- 22 files changed, 50 insertions(+)
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libc/sysdeps/linux/alpha/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h | 2 ++
- 22 files changed, 50 insertions(+)
-
-diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-index d5574c9..cd59b9d 100644
---- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_uid_t __kernel_uid32_t;
- typedef __kernel_gid_t __kernel_gid32_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- int val[2];
-diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
-index 766a306..6b36f32 100644
---- a/libc/sysdeps/linux/arm/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef long long __kernel_loff_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-index f7d8b52..c551d57 100644
---- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -39,6 +39,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef unsigned short __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- #ifdef __GNUC__
- typedef long long __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-index d69a875..9fec595 100644
---- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef long long __kernel_loff_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-index 7557309..2c363a8 100644
---- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-@@ -22,6 +22,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int __kernel_old_uid_t;
- typedef unsigned int __kernel_old_gid_t;
- typedef unsigned int __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef unsigned int __kernel_size_t;
- typedef int __kernel_ssize_t;
- typedef int __kernel_ptrdiff_t;
-diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
-index f122c7f..5d31f7b 100644
---- a/libc/sysdeps/linux/cris/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
-@@ -28,6 +28,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- #ifdef __GNUC__
- typedef long long __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
-index 8017d85..f55a129 100644
---- a/libc/sysdeps/linux/e1/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- /*
-diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-index 0570675..4cfd1bf 100644
---- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef long long __kernel_loff_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-index 4441f9b..6b2e794 100644
---- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-@@ -45,6 +45,8 @@ typedef long long __kernel_off64_t;
- typedef unsigned long long __kernel_ino64_t;
-
- typedef unsigned int __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
-index 9c07c72..59044b8 100644
---- a/libc/sysdeps/linux/i386/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- typedef struct {
-diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-index c8ef86d..e31dc65 100644
---- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
-
- typedef unsigned int __kernel_dev_t;
- typedef unsigned int __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- #endif /* _ASM_IA64_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-index 0a77a8f..176b968 100644
---- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef long long __kernel_loff_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-index 2a70575..a9f736b 100644
---- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-@@ -44,6 +44,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int __kernel_old_uid_t;
- typedef unsigned int __kernel_old_gid_t;
- typedef unsigned int __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- #ifdef __GNUC__
- typedef long long __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
-index 9fc3b96..97faeac 100644
---- a/libc/sysdeps/linux/mips/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef int __kernel_gid32_t;
- typedef __kernel_uid_t __kernel_old_uid_t;
- typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
- #else
- typedef unsigned int __kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int __kernel_gid32_t;
- typedef __kernel_uid_t __kernel_old_uid_t;
- typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
- #endif
-
-diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-index 8b86d79..3c030e7 100644
---- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef unsigned short __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- typedef struct {
-diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-index 3f3b933..1167de2 100644
---- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-@@ -36,6 +36,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int __kernel_old_uid_t;
- typedef unsigned int __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- #else
- typedef unsigned int __kernel_dev_t;
- typedef unsigned int __kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int __kernel_old_uid_t;
- typedef unsigned int __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
- #endif
-
-diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
-index f96e9fa..ac97261 100644
---- a/libc/sysdeps/linux/sh/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- typedef struct {
-diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-index 671cc83..8cc6c61 100644
---- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-@@ -43,6 +43,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- typedef struct {
-diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-index 0cc4bc2..a10e075 100644
---- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short __kernel_gid16_t;
- typedef __kernel_uid_t __kernel_old_uid_t;
- typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef __kernel_uid_t __kernel_uid32_t;
- typedef __kernel_gid_t __kernel_gid32_t;
- typedef int __kernel_suseconds_t;
-@@ -62,6 +64,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
- #endif
-
-diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
-index 3e851ab..780aa8a 100644
---- a/libc/sysdeps/linux/v850/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
-@@ -41,6 +41,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
-
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-index de800d7..0cae08c 100644
---- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- typedef struct {
-diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-index 44f1075..ed38f2e 100644
---- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short __kernel_old_uid_t;
- typedef unsigned short __kernel_old_gid_t;
- typedef unsigned short __kernel_old_dev_t;
-+typedef long __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long __kernel_loff_t;
-
- /* Beginning in 2.6 kernels, which is the first version that includes the
---
-1.8.1.2
-